sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: Substitute __FUNCTION__ with __func__

Browse Source 
The former is not standard C, and we primarily use the latter form.

Change-Id: Ia7091b494ff72588fb6910710fd72165693c1ac5
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42516
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
This commit is contained in:
Angel Pons
2020-06-18 15:20:37 +02:00
parent fe1d80cb08
commit 08e8cab578
12 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/commonlib/include/commonlib/stdlib.h
View File

@ -29,7 +29,7 @@ static inline void *xmalloc_work(size_t size, const char *file,
} }
return ret; return ret;
} }
#define xmalloc(size) xmalloc_work((size), __FILE__, __FUNCTION__, __LINE__) #define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __LINE__)
static inline void *xzalloc_work(size_t size, const char *file, static inline void *xzalloc_work(size_t size, const char *file,
const char *func, int line) const char *func, int line)
@ -38,7 +38,7 @@ static inline void *xzalloc_work(size_t size, const char *file,
memset(ret, 0, size); memset(ret, 0, size);
return ret; return ret;
} }
#define xzalloc(size) xzalloc_work((size), __FILE__, __FUNCTION__, __LINE__) #define xzalloc(size) xzalloc_work((size), __FILE__, __func__, __LINE__)
void *dma_malloc(size_t size); void *dma_malloc(size_t size);
int dma_coherent(void *ptr); int dma_coherent(void *ptr);

2
src/drivers/pc80/tpm/tis.c
View File

@ -395,7 +395,7 @@ static u32 tis_probe(void)
didvid = tpm_read_did_vid(0); didvid = tpm_read_did_vid(0);
if (!didvid || (didvid == 0xffffffff)) { if (!didvid || (didvid == 0xffffffff)) {
printf("%s: No TPM device found\n", __FUNCTION__); printf("%s: No TPM device found\n", __func__);
return TPM_DRIVER_ERR; return TPM_DRIVER_ERR;
} }

4
src/southbridge/intel/bd82x6x/me_8.x.c
View File

@ -416,7 +416,7 @@ static int __unused mkhi_end_of_post(void)
u32 eop_ack; u32 eop_ack;
/* Send request and wait for response */ /* Send request and wait for response */
printk(BIOS_NOTICE, "ME: %s\n", __FUNCTION__); printk(BIOS_NOTICE, "ME: %s\n", __func__);
if (mei_sendrecv(&mei, &mkhi, NULL, &eop_ack, sizeof(eop_ack)) < 0) { if (mei_sendrecv(&mei, &mkhi, NULL, &eop_ack, sizeof(eop_ack)) < 0) {
printk(BIOS_ERR, "ME: END OF POST message failed\n"); printk(BIOS_ERR, "ME: END OF POST message failed\n");
return -1; return -1;
@ -513,7 +513,7 @@ static me_bios_path intel_me_path(struct device *dev)
/* Check if the MBP is ready */ /* Check if the MBP is ready */
if (!gmes.mbp_rdy) { if (!gmes.mbp_rdy) {
printk(BIOS_CRIT, "%s: mbp is not ready!\n", printk(BIOS_CRIT, "%s: mbp is not ready!\n",
__FUNCTION__); __func__);
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
} }

6
src/southbridge/intel/lynxpoint/me_9.x.c
View File

@ -529,7 +529,7 @@ static int mkhi_global_reset(void)
}; };
/* Send request and wait for response */ /* Send request and wait for response */
printk(BIOS_NOTICE, "ME: %s\n", __FUNCTION__); printk(BIOS_NOTICE, "ME: %s\n", __func__);
if (mei_sendrecv_mkhi(&mkhi, &reset, sizeof(reset), NULL, 0) < 0) { if (mei_sendrecv_mkhi(&mkhi, &reset, sizeof(reset), NULL, 0) < 0) {
/* No response means reset will happen shortly... */ /* No response means reset will happen shortly... */
halt(); halt();
@ -551,7 +551,7 @@ static int __unused mkhi_end_of_post(void)
u32 eop_ack; u32 eop_ack;
/* Send request and wait for response */ /* Send request and wait for response */
printk(BIOS_NOTICE, "ME: %s\n", __FUNCTION__); printk(BIOS_NOTICE, "ME: %s\n", __func__);
if (mei_sendrecv_mkhi(&mkhi, NULL, 0, &eop_ack, sizeof(eop_ack)) < 0) { if (mei_sendrecv_mkhi(&mkhi, NULL, 0, &eop_ack, sizeof(eop_ack)) < 0) {
printk(BIOS_ERR, "ME: END OF POST message failed\n"); printk(BIOS_ERR, "ME: END OF POST message failed\n");
return -1; return -1;
@ -698,7 +698,7 @@ static me_bios_path intel_me_path(struct device *dev)
/* Check if the MBP is ready */ /* Check if the MBP is ready */
if (!hfs2.mbp_rdy) { if (!hfs2.mbp_rdy) {
printk(BIOS_CRIT, "%s: mbp is not ready!\n", printk(BIOS_CRIT, "%s: mbp is not ready!\n",
__FUNCTION__); __func__);
path = ME_ERROR_BIOS_PATH; path = ME_ERROR_BIOS_PATH;
} }

28
src/vendorcode/cavium/bdk/libbdk-arch/bdk-csr.c
View File

@ -70,7 +70,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
case BDK_CSR_TYPE_RVU_PFVF_BAR2: case BDK_CSR_TYPE_RVU_PFVF_BAR2:
case BDK_CSR_TYPE_RVU_VF_BAR2: case BDK_CSR_TYPE_RVU_VF_BAR2:
/* Handled by inline code, we should never get here */ /* Handled by inline code, we should never get here */
bdk_error("%s: Passed type that should be handled inline\n", __FUNCTION__); bdk_error("%s: Passed type that should be handled inline\n", __func__);
break; break;
case BDK_CSR_TYPE_PCCBR: case BDK_CSR_TYPE_PCCBR:
@ -80,7 +80,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
case BDK_CSR_TYPE_MDSB: case BDK_CSR_TYPE_MDSB:
case BDK_CSR_TYPE_PCICONFIGEP_SHADOW: case BDK_CSR_TYPE_PCICONFIGEP_SHADOW:
case BDK_CSR_TYPE_PCICONFIGEPVF: case BDK_CSR_TYPE_PCICONFIGEPVF:
bdk_error("%s: Register not supported\n", __FUNCTION__); bdk_error("%s: Register not supported\n", __func__);
break; break;
case BDK_CSR_TYPE_SYSREG: case BDK_CSR_TYPE_SYSREG:
@ -99,7 +99,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC0_CN81XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC0_CN81XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 1: case 1:
if (CAVIUM_IS_MODEL(CAVIUM_CN88XX)) if (CAVIUM_IS_MODEL(CAVIUM_CN88XX))
@ -109,7 +109,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC1_CN81XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC1_CN81XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 2: case 2:
if (CAVIUM_IS_MODEL(CAVIUM_CN88XX)) if (CAVIUM_IS_MODEL(CAVIUM_CN88XX))
@ -119,7 +119,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC2_CN81XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC2_CN81XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 3: case 3:
if (CAVIUM_IS_MODEL(CAVIUM_CN88XX)) if (CAVIUM_IS_MODEL(CAVIUM_CN88XX))
@ -127,7 +127,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
else if (CAVIUM_IS_MODEL(CAVIUM_CN83XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN83XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC3_CN83XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC3_CN83XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 4: case 4:
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC4; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC4;
@ -136,7 +136,7 @@ uint64_t __bdk_csr_read_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, i
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC5; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC5;
break; break;
default: default:
bdk_error("%s: Illegal PCIe bus number\n", __FUNCTION__); bdk_error("%s: Illegal PCIe bus number\n", __func__);
return -1; return -1;
} }
return bdk_pcie_config_read32(node, 100 + dev_con.cn8.ecam, dev_con.s.bus, dev_con.s.func >> 3, dev_con.s.func & 7, address); return bdk_pcie_config_read32(node, 100 + dev_con.cn8.ecam, dev_con.s.bus, dev_con.s.func >> 3, dev_con.s.func & 7, address);
@ -180,7 +180,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
case BDK_CSR_TYPE_RVU_PFVF_BAR2: case BDK_CSR_TYPE_RVU_PFVF_BAR2:
case BDK_CSR_TYPE_RVU_VF_BAR2: case BDK_CSR_TYPE_RVU_VF_BAR2:
/* Handled by inline code, we should never get here */ /* Handled by inline code, we should never get here */
bdk_error("%s: Passed type that should be handled inline\n", __FUNCTION__); bdk_error("%s: Passed type that should be handled inline\n", __func__);
break; break;
case BDK_CSR_TYPE_PCCBR: case BDK_CSR_TYPE_PCCBR:
@ -190,7 +190,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
case BDK_CSR_TYPE_MDSB: case BDK_CSR_TYPE_MDSB:
case BDK_CSR_TYPE_PCICONFIGEP_SHADOW: case BDK_CSR_TYPE_PCICONFIGEP_SHADOW:
case BDK_CSR_TYPE_PCICONFIGEPVF: case BDK_CSR_TYPE_PCICONFIGEPVF:
bdk_error("%s: Register not supported\n", __FUNCTION__); bdk_error("%s: Register not supported\n", __func__);
break; break;
case BDK_CSR_TYPE_SYSREG: case BDK_CSR_TYPE_SYSREG:
@ -210,7 +210,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC0_CN81XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC0_CN81XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 1: case 1:
if (CAVIUM_IS_MODEL(CAVIUM_CN88XX)) if (CAVIUM_IS_MODEL(CAVIUM_CN88XX))
@ -220,7 +220,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC1_CN81XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC1_CN81XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 2: case 2:
if (CAVIUM_IS_MODEL(CAVIUM_CN88XX)) if (CAVIUM_IS_MODEL(CAVIUM_CN88XX))
@ -230,7 +230,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN81XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC2_CN81XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC2_CN81XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 3: case 3:
if (CAVIUM_IS_MODEL(CAVIUM_CN88XX)) if (CAVIUM_IS_MODEL(CAVIUM_CN88XX))
@ -238,7 +238,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
else if (CAVIUM_IS_MODEL(CAVIUM_CN83XX)) else if (CAVIUM_IS_MODEL(CAVIUM_CN83XX))
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC3_CN83XX; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC3_CN83XX;
else else
bdk_fatal("Update PCICONFIG in %s\n", __FUNCTION__); bdk_fatal("Update PCICONFIG in %s\n", __func__);
break; break;
case 4: case 4:
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC4; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC4;
@ -247,7 +247,7 @@ void __bdk_csr_write_slow(bdk_node_t node, bdk_csr_type_t type, int busnum, int
dev_con.u = BDK_PCC_DEV_CON_E_PCIERC5; dev_con.u = BDK_PCC_DEV_CON_E_PCIERC5;
break; break;
default: default:
bdk_error("%s: Illegal PCIe bus number\n", __FUNCTION__); bdk_error("%s: Illegal PCIe bus number\n", __func__);
return; return;
} }
bdk_pcie_config_write32(node, 100 + dev_con.cn8.ecam, dev_con.s.bus, dev_con.s.func >> 3, dev_con.s.func & 7, address, value); bdk_pcie_config_write32(node, 100 + dev_con.cn8.ecam, dev_con.s.bus, dev_con.s.func >> 3, dev_con.s.func & 7, address, value);

2
src/vendorcode/cavium/bdk/libbdk-boot/bdk-boot-qlm.c
View File

@ -162,7 +162,7 @@ static void find_bgx(int node, int qlm, int *bgx, int *bgx_lane_mask)
} }
} }
else else
bdk_error("N%d.QLM%d: Unsupported chip, update %s()\n", node, qlm, __FUNCTION__); bdk_error("N%d.QLM%d: Unsupported chip, update %s()\n", node, qlm, __func__);
} }
/** /**

8
src/vendorcode/cavium/bdk/libbdk-hal/if/bdk-if-phy-marvell.c
View File

@ -49,7 +49,7 @@ static void setup_marvell_phy(bdk_node_t node, int mdio_bus, int mdio_addr)
{ {
int phy_status = 0; int phy_status = 0;
BDK_TRACE(PHY, "%s In SGMII mode for Marvell PHY 88E1512\n", __FUNCTION__); BDK_TRACE(PHY, "%s In SGMII mode for Marvell PHY 88E1512\n", __func__);
/* Switch to Page 18 */ /* Switch to Page 18 */
phy_status = bdk_mdio_write(node, mdio_bus, mdio_addr, 22, 18); phy_status = bdk_mdio_write(node, mdio_bus, mdio_addr, 22, 18);
if (phy_status < 0) if (phy_status < 0)
@ -89,7 +89,7 @@ static void setup_marvell_phy(bdk_node_t node, int mdio_bus, int mdio_addr)
int bdk_if_phy_marvell_setup(bdk_node_t node, int qlm, int mdio_bus, int phy_addr) int bdk_if_phy_marvell_setup(bdk_node_t node, int qlm, int mdio_bus, int phy_addr)
{ {
BDK_TRACE(PHY,"In %s\n",__FUNCTION__); BDK_TRACE(PHY,"In %s\n",__func__);
/* Check if the PHY is marvell PHY we expect */ /* Check if the PHY is marvell PHY we expect */
int phy_status = bdk_mdio_read(node, mdio_bus, phy_addr, BDK_MDIO_PHY_REG_ID1); int phy_status = bdk_mdio_read(node, mdio_bus, phy_addr, BDK_MDIO_PHY_REG_ID1);
@ -100,13 +100,13 @@ int bdk_if_phy_marvell_setup(bdk_node_t node, int qlm, int mdio_bus, int phy_add
/* Switch the marvell PHY to the correct mode */ /* Switch the marvell PHY to the correct mode */
bdk_qlm_modes_t qlm_mode = bdk_qlm_get_mode(node, qlm); bdk_qlm_modes_t qlm_mode = bdk_qlm_get_mode(node, qlm);
BDK_TRACE(PHY,"%s: QLM:%d QLM_MODE:%d\n",__FUNCTION__, qlm, qlm_mode); BDK_TRACE(PHY,"%s: QLM:%d QLM_MODE:%d\n",__func__, qlm, qlm_mode);
if ((qlm_mode != BDK_QLM_MODE_SGMII_1X1) && if ((qlm_mode != BDK_QLM_MODE_SGMII_1X1) &&
(qlm_mode != BDK_QLM_MODE_SGMII_2X1)) (qlm_mode != BDK_QLM_MODE_SGMII_2X1))
return 0; return 0;
BDK_TRACE(PHY,"%s: Detected Marvell Phy in SGMII mode\n", __FUNCTION__); BDK_TRACE(PHY,"%s: Detected Marvell Phy in SGMII mode\n", __func__);
for (int port = 0; port < 2; port++) for (int port = 0; port < 2; port++)
{ {
setup_marvell_phy(node, mdio_bus, phy_addr + port); setup_marvell_phy(node, mdio_bus, phy_addr + port);

2
src/vendorcode/cavium/bdk/libbdk-hal/if/bdk-if-phy-vetesse-8514.c
View File

@ -91,7 +91,7 @@ static void vitesse_init_script(bdk_node_t node, int mdio_bus, int phy_addr)
uint16_t reg_val; uint16_t reg_val;
uint16_t mask; uint16_t mask;
BDK_TRACE(PHY,"In %s\n",__FUNCTION__); BDK_TRACE(PHY,"In %s\n",__func__);
BDK_TRACE(PHY,"Loading init script for VSC8514\n"); BDK_TRACE(PHY,"Loading init script for VSC8514\n");
ptr = init_script_rev_a; ptr = init_script_rev_a;

2
src/vendorcode/cavium/bdk/libbdk-hal/qlm/bdk-qlm-cn81xx.c
View File

@ -773,7 +773,7 @@ static void __bdk_qlm_sff81xx_set_reference(bdk_node_t node, int qlm, int ref_cl
} }
else else
{ {
bdk_error("Update %s for qlm auto config of this chip\n",__FUNCTION__); bdk_error("Update %s for qlm auto config of this chip\n",__func__);
return; return;
} }
BDK_CSR_MODIFY(c, node, BDK_GSERX_REFCLK_SEL(qlm), BDK_CSR_MODIFY(c, node, BDK_GSERX_REFCLK_SEL(qlm),

2
src/vendorcode/cavium/bdk/libdram/dram-internal.h
View File

@ -158,7 +158,7 @@ static inline int get_ddr_type(bdk_node_t node, const dimm_config_t *dimm_config
#define DEVICE_TYPE DDR4_SPD_KEY_BYTE_DEVICE_TYPE // same for DDR3 and DDR4 #define DEVICE_TYPE DDR4_SPD_KEY_BYTE_DEVICE_TYPE // same for DDR3 and DDR4
spd_ddr_type = read_spd(node, dimm_config, DEVICE_TYPE); spd_ddr_type = read_spd(node, dimm_config, DEVICE_TYPE);
debug_print("%s:%d spd_ddr_type=0x%02x\n", __FUNCTION__, __LINE__, spd_ddr_type); debug_print("%s:%d spd_ddr_type=0x%02x\n", __func__, __LINE__, spd_ddr_type);
/* we return only DDR4 or DDR3 */ /* we return only DDR4 or DDR3 */
return (spd_ddr_type == 0x0C) ? DDR4_DRAM : DDR3_DRAM; return (spd_ddr_type == 0x0C) ? DDR4_DRAM : DDR3_DRAM;

22
src/vendorcode/cavium/bdk/libdram/dram-tune-ddr3.c
View File

@ -199,7 +199,7 @@ get_speed_bin(bdk_node_t node, int lmc)
} }
debug_print("N%d.LMC%d: %s: returning bin %d for MTS %d\n", debug_print("N%d.LMC%d: %s: returning bin %d for MTS %d\n",
node, lmc, __FUNCTION__, ret, mts_speed); node, lmc, __func__, ret, mts_speed);
return ret; return ret;
} }
@ -857,9 +857,9 @@ auto_set_dll_offset(bdk_node_t node, int dll_offset_mode,
// run the test one last time // run the test one last time
// print whether there are errors or not, but only when verbose... // print whether there are errors or not, but only when verbose...
bdk_watchdog_poke(); bdk_watchdog_poke();
debug_print("N%d: %s: Start running test one last time\n", node, __FUNCTION__); debug_print("N%d: %s: Start running test one last time\n", node, __func__);
tot_errors = run_dram_tuning_threads(node, num_lmcs, bytemask); tot_errors = run_dram_tuning_threads(node, num_lmcs, bytemask);
debug_print("N%d: %s: Finished running test one last time\n", node, __FUNCTION__); debug_print("N%d: %s: Finished running test one last time\n", node, __func__);
if (tot_errors) if (tot_errors)
ddr_print2("%s Timing Final Test: errors 0x%x\n", mode_str, tot_errors); ddr_print2("%s Timing Final Test: errors 0x%x\n", mode_str, tot_errors);
@ -893,7 +893,7 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
orig_coremask = bdk_get_running_coremask(node); orig_coremask = bdk_get_running_coremask(node);
/* FIXME(dhendrix): %lx --> %llx */ /* FIXME(dhendrix): %lx --> %llx */
ddr_print4("N%d: %s: Starting cores (mask was 0x%llx)\n", ddr_print4("N%d: %s: Starting cores (mask was 0x%llx)\n",
node, __FUNCTION__, orig_coremask); node, __func__, orig_coremask);
/* FIXME(dhendrix): don't call bdk_init_cores(). */ /* FIXME(dhendrix): don't call bdk_init_cores(). */
// bdk_init_cores(node, ~0ULL & ~orig_coremask); // bdk_init_cores(node, ~0ULL & ~orig_coremask);
dram_tune_max_cores = bdk_get_num_running_cores(node); dram_tune_max_cores = bdk_get_num_running_cores(node);
@ -979,7 +979,7 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
ddr_interface_64b = !lmc_config.s.mode32b; ddr_interface_64b = !lmc_config.s.mode32b;
// do setup for each active LMC // do setup for each active LMC
debug_print("N%d: %s: starting LMCs setup.\n", node, __FUNCTION__); debug_print("N%d: %s: starting LMCs setup.\n", node, __func__);
for (lmc = 0; lmc < num_lmcs; lmc++) { for (lmc = 0; lmc < num_lmcs; lmc++) {
#if 0 #if 0
@ -1019,7 +1019,7 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
#endif #endif
// perform cleanup on all active LMCs // perform cleanup on all active LMCs
debug_print("N%d: %s: starting LMCs cleanup.\n", node, __FUNCTION__); debug_print("N%d: %s: starting LMCs cleanup.\n", node, __func__);
for (lmc = 0; lmc < num_lmcs; lmc++) { for (lmc = 0; lmc < num_lmcs; lmc++) {
/* Restore ECC for DRAM tests */ /* Restore ECC for DRAM tests */
@ -1066,12 +1066,12 @@ int perform_dll_offset_tuning(bdk_node_t node, int dll_offset_mode, int do_tune)
uint64_t reset_coremask = 0; uint64_t reset_coremask = 0;
if (reset_coremask) { if (reset_coremask) {
/* FIXME(dhendrix): %lx --> %llx */ /* FIXME(dhendrix): %lx --> %llx */
ddr_print4("N%d: %s: Stopping cores 0x%llx\n", node, __FUNCTION__, ddr_print4("N%d: %s: Stopping cores 0x%llx\n", node, __func__,
reset_coremask); reset_coremask);
bdk_reset_cores(node, reset_coremask); bdk_reset_cores(node, reset_coremask);
} else { } else {
/* FIXME(dhendrix): %lx --> %llx */ /* FIXME(dhendrix): %lx --> %llx */
ddr_print4("N%d: %s: leaving cores set to 0x%llx\n", node, __FUNCTION__, ddr_print4("N%d: %s: leaving cores set to 0x%llx\n", node, __func__,
orig_coremask); orig_coremask);
} }
@ -1215,7 +1215,7 @@ run_best_hw_patterns(bdk_node_t node, int lmc, uint64_t phys_addr,
setup_lfsr_pattern(node, lmc, 0); setup_lfsr_pattern(node, lmc, 0);
errors = test_dram_byte_hw(node, lmc, phys_addr, mode, xor_data); errors = test_dram_byte_hw(node, lmc, phys_addr, mode, xor_data);
VB_PRT(VBL_DEV2, "%s: LFSR at A:0x%012llx errors 0x%x\n", VB_PRT(VBL_DEV2, "%s: LFSR at A:0x%012llx errors 0x%x\n",
__FUNCTION__, phys_addr, errors); __func__, phys_addr, errors);
} else { } else {
for (pattern = 0; pattern < NUM_BYTE_PATTERNS; pattern++) { for (pattern = 0; pattern < NUM_BYTE_PATTERNS; pattern++) {
pattern_p = byte_patterns[pattern]; pattern_p = byte_patterns[pattern];
@ -1224,7 +1224,7 @@ run_best_hw_patterns(bdk_node_t node, int lmc, uint64_t phys_addr,
errs = test_dram_byte_hw(node, lmc, phys_addr, mode, xor_data); errs = test_dram_byte_hw(node, lmc, phys_addr, mode, xor_data);
VB_PRT(VBL_DEV2, "%s: PATTERN %d at A:0x%012llx errors 0x%x\n", VB_PRT(VBL_DEV2, "%s: PATTERN %d at A:0x%012llx errors 0x%x\n",
__FUNCTION__, pattern, phys_addr, errs); __func__, pattern, phys_addr, errs);
errors |= errs; errors |= errs;
} /* for (pattern = 0; pattern < NUM_BYTE_PATTERNS; pattern++) */ } /* for (pattern = 0; pattern < NUM_BYTE_PATTERNS; pattern++) */
@ -1270,7 +1270,7 @@ hw_assist_test_dll_offset(bdk_node_t node, int dll_offset_mode,
hw_rank_offset = 1ull << (28 + lmcx_config.s.pbank_lsb - lmcx_config.s.rank_ena + (num_lmcs/2)); hw_rank_offset = 1ull << (28 + lmcx_config.s.pbank_lsb - lmcx_config.s.rank_ena + (num_lmcs/2));
debug_print("N%d: %s: starting LMC%d with rank offset 0x%lx\n", debug_print("N%d: %s: starting LMC%d with rank offset 0x%lx\n",
node, __FUNCTION__, lmc, hw_rank_offset); node, __func__, lmc, hw_rank_offset);
// start of pattern loop // start of pattern loop
// we do the set of tests for each pattern supplied... // we do the set of tests for each pattern supplied...

24
src/vendorcode/cavium/bdk/libdram/libdram.c
View File

@ -437,21 +437,21 @@ int libdram_tune(int node)
// so, enable any non-running cores on this node, and leave them // so, enable any non-running cores on this node, and leave them
// running at the end... // running at the end...
ddr_print("N%d: %s: Starting cores (mask was 0x%llx)\n", ddr_print("N%d: %s: Starting cores (mask was 0x%llx)\n",
node, __FUNCTION__, bdk_get_running_coremask(node)); node, __func__, bdk_get_running_coremask(node));
bdk_init_cores(node, ~0ULL); bdk_init_cores(node, ~0ULL);
// must test for L2C locked here, cannot go on with it unlocked // must test for L2C locked here, cannot go on with it unlocked
// FIXME: but we only need to worry about Node 0??? // FIXME: but we only need to worry about Node 0???
if (node == 0) { if (node == 0) {
if (!l2c_is_locked) { // is unlocked, must lock it now if (!l2c_is_locked) { // is unlocked, must lock it now
ddr_print("N%d: %s: L2C was unlocked - locking it now\n", node, __FUNCTION__); ddr_print("N%d: %s: L2C was unlocked - locking it now\n", node, __func__);
// FIXME: this should be common-ized; it currently matches bdk_init()... // FIXME: this should be common-ized; it currently matches bdk_init()...
bdk_l2c_lock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4); bdk_l2c_lock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4);
} else { } else {
ddr_print("N%d: %s: L2C was already locked - continuing\n", node, __FUNCTION__); ddr_print("N%d: %s: L2C was already locked - continuing\n", node, __func__);
} }
} else { } else {
ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __FUNCTION__); ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __func__);
} }
// call the tuning routines, no filtering... // call the tuning routines, no filtering...
@ -464,10 +464,10 @@ int libdram_tune(int node)
// FIXME: this should be common-ized; it currently matches bdk_init()... // FIXME: this should be common-ized; it currently matches bdk_init()...
bdk_l2c_unlock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4); bdk_l2c_unlock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4);
} else { } else {
ddr_print("N%d: %s: L2C was already locked - leaving it locked\n", node, __FUNCTION__); ddr_print("N%d: %s: L2C was already locked - leaving it locked\n", node, __func__);
} }
} else { } else {
ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __FUNCTION__); ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __func__);
} }
// make sure to clear memory and any ECC errs when done... // make sure to clear memory and any ECC errs when done...
@ -605,21 +605,21 @@ int libdram_margin(int node)
// so, enable any non-running cores on this node, and leave them // so, enable any non-running cores on this node, and leave them
// running at the end... // running at the end...
ddr_print("N%d: %s: Starting cores (mask was 0x%llx)\n", ddr_print("N%d: %s: Starting cores (mask was 0x%llx)\n",
node, __FUNCTION__, bdk_get_running_coremask(node)); node, __func__, bdk_get_running_coremask(node));
bdk_init_cores(node, ~0ULL); bdk_init_cores(node, ~0ULL);
// must test for L2C locked here, cannot go on with it unlocked // must test for L2C locked here, cannot go on with it unlocked
// FIXME: but we only need to worry about Node 0??? // FIXME: but we only need to worry about Node 0???
if (node == 0) { if (node == 0) {
if (!l2c_is_locked) { // is unlocked, must lock it now if (!l2c_is_locked) { // is unlocked, must lock it now
ddr_print("N%d: %s: L2C was unlocked - locking it now\n", node, __FUNCTION__); ddr_print("N%d: %s: L2C was unlocked - locking it now\n", node, __func__);
// FIXME: this should be common-ized; it currently matches bdk_init()... // FIXME: this should be common-ized; it currently matches bdk_init()...
bdk_l2c_lock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4); bdk_l2c_lock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4);
} else { } else {
ddr_print("N%d: %s: L2C was already locked - continuing\n", node, __FUNCTION__); ddr_print("N%d: %s: L2C was already locked - continuing\n", node, __func__);
} }
} else { } else {
ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __FUNCTION__); ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __func__);
} }
debug_print("N%d: Starting DRAM Margin ALL\n", node); debug_print("N%d: Starting DRAM Margin ALL\n", node);
@ -659,10 +659,10 @@ int libdram_margin(int node)
// FIXME: this should be common-ized; it currently matches bdk_init()... // FIXME: this should be common-ized; it currently matches bdk_init()...
bdk_l2c_unlock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4); bdk_l2c_unlock_mem_region(node, 0, bdk_l2c_get_cache_size_bytes(node) * 3 / 4);
} else { } else {
ddr_print("N%d: %s: L2C was already locked - leaving it locked\n", node, __FUNCTION__); ddr_print("N%d: %s: L2C was already locked - leaving it locked\n", node, __func__);
} }
} else { } else {
ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __FUNCTION__); ddr_print("N%d: %s: non-zero node, not worrying about L2C lock status\n", node, __func__);
} }
return 0; return 0;