Evolution-X-Devices/kernel_oneplus_8750-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: kgsl: Map fusa resource during first boot only

Browse Source 
Fusa registers are accessed during first boot only. Thus, remove
it from regmap and map it temporarily during first boot.

Change-Id: If0ca6b2f36092f0448bdc7b6a7bf945a078bab92
Signed-off-by: Kamal Agrawal <quic_kamaagra@quicinc.com>
Signed-off-by: Hui Li <quic_hul@quicinc.com>
This commit is contained in:
Kamal Agrawal
2023-01-28 19:09:14 +05:30
committed by Gerrit - the friendly Code Review server
parent fd9d848153
commit 3fff8da170
4 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
a6xx_reg.h
View File

@@ -1225,6 +1225,7 @@
(((1 << A6XX_GPU_LLC_SCID_NUM_BITS) - 1) << A6XX_GPUHTW_LLC_SCID_SHIFT)
/* FUSA registers */
#define A6XX_GPU_FUSA_REG_BASE 0x3FC00
#define A6XX_GPU_FUSA_REG_ECC_CTRL 0x3FC00
#define A6XX_GPU_FUSA_REG_CSR_PRIY 0x3FC52
#define A6XX_GPU_FUSA_DISABLE_NUM_BITS 4

3
adreno.c
View File

@@ -1307,9 +1307,6 @@ int adreno_device_probe(struct platform_device *pdev,
/* Add CX_DBGC block to the regmap*/
kgsl_regmap_add_region(&device->regmap, pdev, "cx_dbgc", NULL, NULL);
/* Add FUSA block to the regmap */
kgsl_regmap_add_region(&device->regmap, pdev, "fusa", NULL, NULL);
/* Probe for the optional CX_MISC block */
adreno_cx_misc_probe(device);

58
adreno_a6xx_gmu.c
View File

@@ -90,6 +90,26 @@ static struct gmu_vma_entry a6xx_gmu_vma[] = {
},
};
static void _regwrite(void __iomem *regbase, u32 offsetwords, u32 value)
{
void __iomem *reg;
reg = regbase + (offsetwords << 2);
__raw_writel(value, reg);
}
static void _regrmw(void __iomem *regbase, u32 offsetwords, u32 mask, u32 or)
{
void __iomem *reg;
u32 val;
reg = regbase + (offsetwords << 2);
val = __raw_readl(reg);
/* Make sure the read posted and all pending writes are done */
mb();
__raw_writel((val & ~mask) | or, reg);
}
static ssize_t log_stream_enable_store(struct kobject *kobj,
struct kobj_attribute *attr, const char *buf, size_t count)
{
@@ -277,15 +297,6 @@ struct adreno_device *a6xx_gmu_to_adreno(struct a6xx_gmu_device *gmu)
#define PDC_CMD_OFFSET 4
#define PDC_ENABLE_REG_VALUE 0x80000001
static void _regwrite(void __iomem *regbase,
unsigned int offsetwords, unsigned int value)
{
void __iomem *reg;
reg = regbase + (offsetwords << 2);
__raw_writel(value, reg);
}
void a6xx_load_rsc_ucode(struct adreno_device *adreno_dev)
{
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
@@ -3160,17 +3171,32 @@ void a6xx_disable_gpu_irq(struct adreno_device *adreno_dev)
}
void a6xx_fusa_init(struct adreno_device *adreno_dev)
static void a6xx_fusa_init(struct adreno_device *adreno_dev)
{
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
void __iomem *fusa_virt = NULL;
struct resource *res;
if (adreno_is_a663(adreno_dev)) {
/* disable fusa mode in bu stage */
kgsl_regrmw(device, A6XX_GPU_FUSA_REG_ECC_CTRL,
A6XX_GPU_FUSA_DISABLE_MASK, A6XX_GPU_FUSA_DISABLE_BITS);
kgsl_regrmw(device, A6XX_GPU_FUSA_REG_CSR_PRIY,
A6XX_GPU_FUSA_DISABLE_MASK, A6XX_GPU_FUSA_DISABLE_BITS);
if (!adreno_is_a663(adreno_dev))
return;
res = platform_get_resource_byname(device->pdev,
IORESOURCE_MEM, "fusa");
if (res)
fusa_virt = ioremap(res->start, resource_size(res));
if (!fusa_virt) {
dev_err(device->dev, "Failed to map fusa\n");
return;
}
/* Disable fusa mode in boot stage */
_regrmw(fusa_virt, A6XX_GPU_FUSA_REG_ECC_CTRL - A6XX_GPU_FUSA_REG_BASE,
A6XX_GPU_FUSA_DISABLE_MASK, A6XX_GPU_FUSA_DISABLE_BITS);
_regrmw(fusa_virt, A6XX_GPU_FUSA_REG_CSR_PRIY - A6XX_GPU_FUSA_REG_BASE,
A6XX_GPU_FUSA_DISABLE_MASK, A6XX_GPU_FUSA_DISABLE_BITS);
iounmap(fusa_virt);
}
static int a6xx_gpu_boot(struct adreno_device *adreno_dev)

6
adreno_a6xx_gmu.h
View File

@@ -215,12 +215,6 @@ void a6xx_enable_gpu_irq(struct adreno_device *adreno_dev);
*/
void a6xx_disable_gpu_irq(struct adreno_device *adreno_dev);
/**
* a6xx_fusa_init - Init gpu fusa
* @adreno_dev: Pointer to the adreno device
*/
void a6xx_fusa_init(struct adreno_device *adreno_dev);
/**
* a6xx_gmu_snapshot- Take snapshot for gmu targets
* @adreno_dev: Pointer to the adreno device