be2net: fix log messages in lancer FW download path
Log messages in the Lancer FW download path have issues such as: - a single message spanning multiple lines - the success message is logged even in failure cases - status codes are already logged in the FW cmd routines This patch fixes these issues. Signed-off-by: Kalesh AP <kalesh.purayil@emulex.com> Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d3de154071
commit
bb864e07b2
|
@ -4076,6 +4076,7 @@ static int lancer_fw_download(struct be_adapter *adapter,
|
||||||
{
|
{
|
||||||
#define LANCER_FW_DOWNLOAD_CHUNK (32 * 1024)
|
#define LANCER_FW_DOWNLOAD_CHUNK (32 * 1024)
|
||||||
#define LANCER_FW_DOWNLOAD_LOCATION "/prg"
|
#define LANCER_FW_DOWNLOAD_LOCATION "/prg"
|
||||||
|
struct device *dev = &adapter->pdev->dev;
|
||||||
struct be_dma_mem flash_cmd;
|
struct be_dma_mem flash_cmd;
|
||||||
const u8 *data_ptr = NULL;
|
const u8 *data_ptr = NULL;
|
||||||
u8 *dest_image_ptr = NULL;
|
u8 *dest_image_ptr = NULL;
|
||||||
|
@ -4088,16 +4089,14 @@ static int lancer_fw_download(struct be_adapter *adapter,
|
||||||
u8 change_status;
|
u8 change_status;
|
||||||
|
|
||||||
if (!IS_ALIGNED(fw->size, sizeof(u32))) {
|
if (!IS_ALIGNED(fw->size, sizeof(u32))) {
|
||||||
dev_err(&adapter->pdev->dev,
|
dev_err(dev, "FW image size should be multiple of 4\n");
|
||||||
"FW Image not properly aligned. "
|
|
||||||
"Length must be 4 byte aligned.\n");
|
|
||||||
status = -EINVAL;
|
status = -EINVAL;
|
||||||
goto lancer_fw_exit;
|
goto lancer_fw_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
flash_cmd.size = sizeof(struct lancer_cmd_req_write_object)
|
flash_cmd.size = sizeof(struct lancer_cmd_req_write_object)
|
||||||
+ LANCER_FW_DOWNLOAD_CHUNK;
|
+ LANCER_FW_DOWNLOAD_CHUNK;
|
||||||
flash_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, flash_cmd.size,
|
flash_cmd.va = dma_alloc_coherent(dev, flash_cmd.size,
|
||||||
&flash_cmd.dma, GFP_KERNEL);
|
&flash_cmd.dma, GFP_KERNEL);
|
||||||
if (!flash_cmd.va) {
|
if (!flash_cmd.va) {
|
||||||
status = -ENOMEM;
|
status = -ENOMEM;
|
||||||
|
@ -4137,33 +4136,26 @@ static int lancer_fw_download(struct be_adapter *adapter,
|
||||||
&add_status);
|
&add_status);
|
||||||
}
|
}
|
||||||
|
|
||||||
dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va,
|
dma_free_coherent(dev, flash_cmd.size, flash_cmd.va, flash_cmd.dma);
|
||||||
flash_cmd.dma);
|
|
||||||
if (status) {
|
if (status) {
|
||||||
dev_err(&adapter->pdev->dev,
|
dev_err(dev, "Firmware load error\n");
|
||||||
"Firmware load error. "
|
|
||||||
"Status code: 0x%x Additional Status: 0x%x\n",
|
|
||||||
status, add_status);
|
|
||||||
goto lancer_fw_exit;
|
goto lancer_fw_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dev_info(dev, "Firmware flashed successfully\n");
|
||||||
|
|
||||||
if (change_status == LANCER_FW_RESET_NEEDED) {
|
if (change_status == LANCER_FW_RESET_NEEDED) {
|
||||||
dev_info(&adapter->pdev->dev,
|
dev_info(dev, "Resetting adapter to activate new FW\n");
|
||||||
"Resetting adapter to activate new FW\n");
|
|
||||||
status = lancer_physdev_ctrl(adapter,
|
status = lancer_physdev_ctrl(adapter,
|
||||||
PHYSDEV_CONTROL_FW_RESET_MASK);
|
PHYSDEV_CONTROL_FW_RESET_MASK);
|
||||||
if (status) {
|
if (status) {
|
||||||
dev_err(&adapter->pdev->dev,
|
dev_err(dev, "Adapter busy, could not reset FW\n");
|
||||||
"Adapter busy for FW reset.\n"
|
dev_err(dev, "Reboot server to activate new FW\n");
|
||||||
"New FW will not be active.\n");
|
|
||||||
goto lancer_fw_exit;
|
goto lancer_fw_exit;
|
||||||
}
|
}
|
||||||
} else if (change_status != LANCER_NO_RESET_NEEDED) {
|
} else if (change_status != LANCER_NO_RESET_NEEDED) {
|
||||||
dev_err(&adapter->pdev->dev,
|
dev_info(dev, "Reboot server to activate new FW\n");
|
||||||
"System reboot required for new FW to be active\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_info(&adapter->pdev->dev, "Firmware flashed successfully\n");
|
|
||||||
lancer_fw_exit:
|
lancer_fw_exit:
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue