nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 17:55:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvdla: kmd: Add Soft SKU support

Browse Source 
- Read Soft sku to identify if any of
  the DLA instances are disabled and
  not initialize that instance

Bug 3545642

Change-Id: Iefcd0616672fe1d2c7448ae571befa3ebe729d1f
Signed-off-by: Praveen K <kpraveen@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2675805
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Arvind M <am@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Praveen K
2022-02-28 11:37:07 +00:00
committed by Laxman Dewangan
parent 726a34aac5
commit acc29a8f3a
2 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/video/tegra/host/nvdla/nvdla.c
View File

@@ -589,6 +589,24 @@ out:
return ret;
}
static uint32_t nvdla_read_soft_sku_scratch_register(void)
{
uint32_t dla_soft_sku_opt_disable = 0U;
void __iomem *scratch_base;
/*
* Map the scratch physical address base, read the register
* from the correct offset and then unmap
*/
scratch_base = ioremap(SCRATCH_REG_BASE_ADDRESS, SCRATCH_REG_MMAP_SIZE);
if (scratch_base) {
dla_soft_sku_opt_disable = __raw_readl(scratch_base + SCRATCH_REG_SW_SKU_OFFSET);
iounmap(scratch_base);
}
return dla_soft_sku_opt_disable;
}
static int nvhost_nvdla_read_chip_option_register(struct platform_device *pdev)
{
/* Read floor sweeping info using nvmem api
@@ -688,6 +706,7 @@ static int nvdla_probe(struct platform_device *pdev)
struct nvdla_device *nvdla_dev = NULL;
struct device *dev = &pdev->dev;
int fuse_ret = 0;
uint32_t soft_fuse_ret = 0U;
if (pdev->dev.of_node) {
const struct of_device_id *match;
@@ -722,20 +741,41 @@ static int nvdla_probe(struct platform_device *pdev)
}
if (pdata->version == FIRMWARE_ENCODE_VERSION(T23X)) {
fuse_ret = nvhost_nvdla_read_chip_option_register(pdev);
if ((fuse_ret & FUSE_OPT_DLA_0_DISABLED) &&
(pdata->class == NV_DLA0_CLASS_ID)) {
soft_fuse_ret = nvdla_read_soft_sku_scratch_register();
if (soft_fuse_ret & SOFT_SKU_OVERRIDE_ENABLE_MASK) {
if ((soft_fuse_ret & FUSE_OPT_DLA_0_DISABLED_SOFT)
&& (pdata->class == NV_DLA0_CLASS_ID)) {
dev_err(dev, "NVDLA0 IP is disabled in Soft Fuse\n");
err = -ENODEV;
goto err_no_ip;
}
if ((soft_fuse_ret & FUSE_OPT_DLA_1_DISABLED_SOFT)
&& (pdata->class == NV_DLA1_CLASS_ID)) {
dev_err(dev, "NVDLA1 IP is disabled in Soft Fuse\n");
err = -ENODEV;
goto err_no_ip;
}
} else {
fuse_ret = nvhost_nvdla_read_chip_option_register(pdev);
if ((fuse_ret & FUSE_OPT_DLA_0_DISABLED)
&& (pdata->class == NV_DLA0_CLASS_ID)) {
dev_err(dev, "NVDLA0 IP is disabled in Fuse\n");
err = -ENODEV;
goto err_no_ip;
}
}
if ((fuse_ret & FUSE_OPT_DLA_1_DISABLED) &&
(pdata->class == NV_DLA1_CLASS_ID)) {
if ((fuse_ret & FUSE_OPT_DLA_1_DISABLED)
&& (pdata->class == NV_DLA1_CLASS_ID)) {
dev_err(dev, "NVDLA1 IP is disabled in Fuse\n");
err = -ENODEV;
goto err_no_ip;
}
}
}

33
drivers/video/tegra/host/nvdla/nvdla.h
View File

@@ -91,6 +91,39 @@ enum {
*/
#define FUSE_OPT_DLA_1_DISABLED 2
/**
* Bit at mask of the Soft Sku register
* when DLA0 is disabled
*/
#define FUSE_OPT_DLA_0_DISABLED_SOFT 0x8000000
/**
* Bit at mask of the Soft Sku register set
* when DLA1 is disabled
*/
#define FUSE_OPT_DLA_1_DISABLED_SOFT 0x10000000
/* Bit at mask is set when Soft SKU is enabled
*/
#define SOFT_SKU_OVERRIDE_ENABLE_MASK 0x80000000
/*
* Physical base address of scratch area
*/
#define SCRATCH_REG_BASE_ADDRESS 0xc390000
/*
* Number of bytes to be mapped from the
* scratch area
*/
#define SCRATCH_REG_MMAP_SIZE 0x200
/*
* Offset to the Sw SKU register in
* the scratch area
*/
#define SCRATCH_REG_SW_SKU_OFFSET 0x180
/**
* Maximum number of queue's per engine
*/