Skip to content

Import 6.4.11.p3.2 original version #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Import 6.4.11.p3.2 original version #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fea68f1
Import 6.4.11.p3.2 original version
gibsson Jun 27, 2025
eaa61b2
Merge tag 'upstream/6.4.11.p3.2'
gibsson Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kernel-module-imx-gpu-viv-src/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ endif

ifeq ($(CONFIG_FTRACE),y)
ifneq ($(CONFIG_ANDROID),y)
ccflags-y += -DgcdSYSTRACE=1 -DgcdDEBUG=gcdDEBUG_TRACE
#ccflags-y += -DgcdSYSTRACE=1 -DgcdDEBUG=gcdDEBUG_TRACE
endif
endif

Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
37 changes: 24 additions & 13 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -2615,9 +2615,7 @@ gckHARDWARE_InitializeHardware(IN gckHARDWARE Hardware)
offset + 0x2C, 0x2));
}

#if !gcdCAPTURE_ONLY_MODE
gcmkONERROR(gckHARDWARE_SetMMU(Hardware, Hardware->kernel->mmu));
#endif

if (Hardware->mcFE) {
/* Reinitialize MCFE, now MMU is enabled. */
Expand Down Expand Up @@ -7372,6 +7370,10 @@ gckHARDWARE_QueryIdle(IN gckHARDWARE Hardware, OUT gctBOOL_PTR IsIdle)
gceSTATUS status = gcvSTATUS_OK;
gctUINT32 idle;
gctBOOL isIdle = gcvFALSE;
#if gcdCAPTURE_ONLY_MODE
gcsDATABASE_PTR database = gcvNULL;
gctUINT32 processID;
#endif

#if gcdINTERRUPT_STATISTIC
gckEVENT eventObj = Hardware->kernel->eventObj;
Expand All @@ -7385,8 +7387,16 @@ gckHARDWARE_QueryIdle(IN gckHARDWARE Hardware, OUT gctBOOL_PTR IsIdle)
gcmkVERIFY_ARGUMENT(IsIdle != gcvNULL);

#if gcdCAPTURE_ONLY_MODE
*IsIdle = gcvTRUE;
gcmkONERROR(status);
gcmkONERROR(gckOS_GetProcessID(&processID));

if (processID) {
gckKERNEL_FindDatabase(Hardware->kernel, processID, gcvFALSE, &database);

if (database && database->matchCaptureOnly) {
*IsIdle = gcvTRUE;
gcmkONERROR(status);
}
}
#endif

do {
Expand Down Expand Up @@ -9243,9 +9253,10 @@ gceSTATUS
gckHARDWARE_HandleFault(IN gckHARDWARE Hardware)
{
gceSTATUS status = gcvSTATUS_NOT_SUPPORTED;
gctUINT32 mmu, mmuStatus, address = 0, i = 0;
gctUINT32 mmu, mmuStatus, reg, i = 0;
gctUINT32 mmuStatusRegAddress;
gctUINT32 mmuExceptionAddress;
gctADDRESS address = 0;

gcmkHEADER_ARG("Hardware=%p", Hardware);

Expand Down Expand Up @@ -9276,7 +9287,9 @@ gckHARDWARE_HandleFault(IN gckHARDWARE Hardware)
continue;

gcmkVERIFY_OK(gckOS_ReadRegisterEx(Hardware->os, Hardware->kernel,
mmuExceptionAddress + i * 4, &address));
mmuExceptionAddress + i * 4, &reg));

address = reg;

break;
}
Expand All @@ -9289,19 +9302,21 @@ gckHARDWARE_HandleFault(IN gckHARDWARE Hardware)
gctSIZE_T offset = 0;
gctPHYS_ADDR_T physicalAddress = 0;
gceAREA_TYPE areaType;
#if !gcdENABLE_TRUST_APPLICATION
gctUINT32 pageMask;
#endif
gcePAGE_TYPE pageType;

gctUINT32_PTR entry;

gckMMU_GetAreaType(Hardware->kernel->mmu, address, &areaType);

pageMask = (areaType == gcvAREA_TYPE_4K) ? gcdMMU_PAGE_4K_MASK : gcdMMU_PAGE_1M_MASK;
pageType = (areaType == gcvAREA_TYPE_4K) ? gcvPAGE_TYPE_4K : gcvPAGE_TYPE_1M;

#if gcdENABLE_TRUST_APPLICATION
address &= ~gcdMMU_PAGE_4K_MASK;
#else
pageMask = (areaType == gcvAREA_TYPE_4K) ? gcdMMU_PAGE_4K_MASK : gcdMMU_PAGE_1M_MASK;
address &= ~pageMask;
#endif

Expand Down Expand Up @@ -10357,10 +10372,6 @@ gckHARDWARE_ExecuteFunctions(IN gcsFUNCTION_EXECUTION_PTR Execution)
gctADDRESS address;
gckHARDWARE hardware = (gckHARDWARE)Execution->hardware;

#if gcdCAPTURE_ONLY_MODE
gcmkONERROR(status);
#endif

#if gcdDUMP_IN_KERNEL
gcmkDUMP(hardware->os, "#[function: %s]", Execution->funcName);
#endif
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_async_fe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_fe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func_flop_reset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func_flop_reset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
5 changes: 3 additions & 2 deletions ...el-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func_flop_reset_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand All @@ -52,6 +52,7 @@
*
*****************************************************************************/


#ifndef __gc_hal_kernel_hardware_func_flop_reset_config_h_
#define __gc_hal_kernel_hardware_func_flop_reset_config_h_

Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func_ppu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
4 changes: 2 additions & 2 deletions kernel-module-imx-gpu-viv-src/hal/kernel/arch/gc_hal_kernel_hardware_func_usc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* The MIT License (MIT)
*
* Copyright (c) 2014 - 2023 Vivante Corporation
* Copyright (c) 2014 - 2024 Vivante Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand All @@ -26,7 +26,7 @@
*
* The GPL License (GPL)
*
* Copyright (C) 2014 - 2023 Vivante Corporation
* Copyright (C) 2014 - 2024 Vivante Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Expand Down
Loading