OmniNX/Atmosphere-Pro
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fusee/sept: fix fuse driver to not infinitely recurse on get_soc_type()

Browse Source
This commit is contained in:
Michael Scire authored and SciresM committed 2021-01-05 11:05:33 -08:00
1 parent e391f593de
commit ff7e52a1c1
5 files changed
+75 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fusee/fusee-mtc/src/fuse.c
+15 -13
View File
@@ -164,22 +164,24 @@ uint32_t fuse_get_spare_bit(uint32_t index) {
/* Read a reserved ODM register. */ /* Read a reserved ODM register. */
uint32_t fuse_get_reserved_odm(uint32_t index) { uint32_t fuse_get_reserved_odm(uint32_t index) {
uint32_t soc_type = fuse_get_soc_type();
if (index < 8) { if (index < 8) {
volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs(); volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs();
return fuse_chip->FUSE_RESERVED_ODM0[index]; return fuse_chip->FUSE_RESERVED_ODM0[index];
} else if (soc_type == 1) { } else {
volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs(); uint32_t soc_type = fuse_get_soc_type();
if (index < 22) { if (soc_type == 1) {
return fuse_chip->FUSE_RESERVED_ODM8[index - 8]; volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs();
} else if (index < 25) { if (index < 22) {
return fuse_chip->FUSE_RESERVED_ODM22[index - 22]; return fuse_chip->FUSE_RESERVED_ODM8[index - 8];
} else if (index < 26) { } else if (index < 25) {
return fuse_chip->FUSE_RESERVED_ODM25; return fuse_chip->FUSE_RESERVED_ODM22[index - 22];
} else if (index < 29) { } else if (index < 26) {
return fuse_chip->FUSE_RESERVED_ODM26[index - 26]; return fuse_chip->FUSE_RESERVED_ODM25;
} else if (index < 30) { } else if (index < 29) {
return fuse_chip->FUSE_RESERVED_ODM29; return fuse_chip->FUSE_RESERVED_ODM26[index - 26];
} else if (index < 30) {
return fuse_chip->FUSE_RESERVED_ODM29;
}
} }
} }
return 0; return 0;
fusee/fusee-primary/fusee-primary-main/src/fuse.c
+15 -13
View File
@@ -164,22 +164,24 @@ uint32_t fuse_get_spare_bit(uint32_t index) {
/* Read a reserved ODM register. */ /* Read a reserved ODM register. */
uint32_t fuse_get_reserved_odm(uint32_t index) { uint32_t fuse_get_reserved_odm(uint32_t index) {
uint32_t soc_type = fuse_get_soc_type();
if (index < 8) { if (index < 8) {
volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs(); volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs();
return fuse_chip->FUSE_RESERVED_ODM0[index]; return fuse_chip->FUSE_RESERVED_ODM0[index];
} else if (soc_type == 1) { } else {
volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs(); uint32_t soc_type = fuse_get_soc_type();
if (index < 22) { if (soc_type == 1) {
return fuse_chip->FUSE_RESERVED_ODM8[index - 8]; volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs();
} else if (index < 25) { if (index < 22) {
return fuse_chip->FUSE_RESERVED_ODM22[index - 22]; return fuse_chip->FUSE_RESERVED_ODM8[index - 8];
} else if (index < 26) { } else if (index < 25) {
return fuse_chip->FUSE_RESERVED_ODM25; return fuse_chip->FUSE_RESERVED_ODM22[index - 22];
} else if (index < 29) { } else if (index < 26) {
return fuse_chip->FUSE_RESERVED_ODM26[index - 26]; return fuse_chip->FUSE_RESERVED_ODM25;
} else if (index < 30) { } else if (index < 29) {
return fuse_chip->FUSE_RESERVED_ODM29; return fuse_chip->FUSE_RESERVED_ODM26[index - 26];
} else if (index < 30) {
return fuse_chip->FUSE_RESERVED_ODM29;
}
} }
} }
return 0; return 0;
fusee/fusee-secondary/src/fuse.c
+15 -13
View File
@@ -164,22 +164,24 @@ uint32_t fuse_get_spare_bit(uint32_t index) {
/* Read a reserved ODM register. */ /* Read a reserved ODM register. */
uint32_t fuse_get_reserved_odm(uint32_t index) { uint32_t fuse_get_reserved_odm(uint32_t index) {
uint32_t soc_type = fuse_get_soc_type();
if (index < 8) { if (index < 8) {
volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs(); volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs();
return fuse_chip->FUSE_RESERVED_ODM0[index]; return fuse_chip->FUSE_RESERVED_ODM0[index];
} else if (soc_type == 1) { } else {
volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs(); uint32_t soc_type = fuse_get_soc_type();
if (index < 22) { if (soc_type == 1) {
return fuse_chip->FUSE_RESERVED_ODM8[index - 8]; volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs();
} else if (index < 25) { if (index < 22) {
return fuse_chip->FUSE_RESERVED_ODM22[index - 22]; return fuse_chip->FUSE_RESERVED_ODM8[index - 8];
} else if (index < 26) { } else if (index < 25) {
return fuse_chip->FUSE_RESERVED_ODM25; return fuse_chip->FUSE_RESERVED_ODM22[index - 22];
} else if (index < 29) { } else if (index < 26) {
return fuse_chip->FUSE_RESERVED_ODM26[index - 26]; return fuse_chip->FUSE_RESERVED_ODM25;
} else if (index < 30) { } else if (index < 29) {
return fuse_chip->FUSE_RESERVED_ODM29; return fuse_chip->FUSE_RESERVED_ODM26[index - 26];
} else if (index < 30) {
return fuse_chip->FUSE_RESERVED_ODM29;
}
} }
} }
return 0; return 0;
sept/sept-primary/src/fuse.c
+15 -13
View File
@@ -164,22 +164,24 @@ uint32_t fuse_get_spare_bit(uint32_t index) {
/* Read a reserved ODM register. */ /* Read a reserved ODM register. */
uint32_t fuse_get_reserved_odm(uint32_t index) { uint32_t fuse_get_reserved_odm(uint32_t index) {
uint32_t soc_type = fuse_get_soc_type();
if (index < 8) { if (index < 8) {
volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs(); volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs();
return fuse_chip->FUSE_RESERVED_ODM0[index]; return fuse_chip->FUSE_RESERVED_ODM0[index];
} else if (soc_type == 1) { } else {
volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs(); uint32_t soc_type = fuse_get_soc_type();
if (index < 22) { if (soc_type == 1) {
return fuse_chip->FUSE_RESERVED_ODM8[index - 8]; volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs();
} else if (index < 25) { if (index < 22) {
return fuse_chip->FUSE_RESERVED_ODM22[index - 22]; return fuse_chip->FUSE_RESERVED_ODM8[index - 8];
} else if (index < 26) { } else if (index < 25) {
return fuse_chip->FUSE_RESERVED_ODM25; return fuse_chip->FUSE_RESERVED_ODM22[index - 22];
} else if (index < 29) { } else if (index < 26) {
return fuse_chip->FUSE_RESERVED_ODM26[index - 26]; return fuse_chip->FUSE_RESERVED_ODM25;
} else if (index < 30) { } else if (index < 29) {
return fuse_chip->FUSE_RESERVED_ODM29; return fuse_chip->FUSE_RESERVED_ODM26[index - 26];
} else if (index < 30) {
return fuse_chip->FUSE_RESERVED_ODM29;
}
} }
} }
return 0; return 0;
sept/sept-secondary/src/fuse.c
+15 -13
View File
@@ -164,22 +164,24 @@ uint32_t fuse_get_spare_bit(uint32_t index) {
/* Read a reserved ODM register. */ /* Read a reserved ODM register. */
uint32_t fuse_get_reserved_odm(uint32_t index) { uint32_t fuse_get_reserved_odm(uint32_t index) {
uint32_t soc_type = fuse_get_soc_type();
if (index < 8) { if (index < 8) {
volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs(); volatile tegra_fuse_chip_common_t *fuse_chip = fuse_chip_common_get_regs();
return fuse_chip->FUSE_RESERVED_ODM0[index]; return fuse_chip->FUSE_RESERVED_ODM0[index];
} else if (soc_type == 1) { } else {
volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs(); uint32_t soc_type = fuse_get_soc_type();
if (index < 22) { if (soc_type == 1) {
return fuse_chip->FUSE_RESERVED_ODM8[index - 8]; volatile tegra_fuse_chip_mariko_t *fuse_chip = fuse_chip_mariko_get_regs();
} else if (index < 25) { if (index < 22) {
return fuse_chip->FUSE_RESERVED_ODM22[index - 22]; return fuse_chip->FUSE_RESERVED_ODM8[index - 8];
} else if (index < 26) { } else if (index < 25) {
return fuse_chip->FUSE_RESERVED_ODM25; return fuse_chip->FUSE_RESERVED_ODM22[index - 22];
} else if (index < 29) { } else if (index < 26) {
return fuse_chip->FUSE_RESERVED_ODM26[index - 26]; return fuse_chip->FUSE_RESERVED_ODM25;
} else if (index < 30) { } else if (index < 29) {
return fuse_chip->FUSE_RESERVED_ODM29; return fuse_chip->FUSE_RESERVED_ODM26[index - 26];
} else if (index < 30) {
return fuse_chip->FUSE_RESERVED_ODM29;
}
} }
} }
return 0; return 0;