renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-03 10:54:03 +08:00
Code

firmware: arm_scpi: improve info message for pre-1.0 firmware

Browse Source 
On legacy pre-1.0 firmware versions so far the following message is
printed which may cause some confusion:
SCP Protocol 0.0 Firmware 0.0.0 version

Therefore replace the message with the following if firmware doesn't
provide usable version information:
SCP Protocol legacy pre-1.0 firmware

Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Heiner Kallweit 2017-12-05 23:17:19 +01:00 committed by Sudeep Holla
parent 96fe77b6d4
commit 62c60efb63
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/firmware/arm_scpi.c
View File

@ -1005,12 +1005,21 @@ static int scpi_probe(struct platform_device *pdev)
return ret; return ret;
} }
dev_info(dev, "SCP Protocol %lu.%lu Firmware %lu.%lu.%lu version\n", if (scpi_info->is_legacy && !scpi_info->protocol_version &&
FIELD_GET(PROTO_REV_MAJOR_MASK, scpi_info->protocol_version), !scpi_info->firmware_version)
FIELD_GET(PROTO_REV_MINOR_MASK, scpi_info->protocol_version), dev_info(dev, "SCP Protocol legacy pre-1.0 firmware\n");
FIELD_GET(FW_REV_MAJOR_MASK, scpi_info->firmware_version), else
FIELD_GET(FW_REV_MINOR_MASK, scpi_info->firmware_version), dev_info(dev, "SCP Protocol %lu.%lu Firmware %lu.%lu.%lu version\n",
FIELD_GET(FW_REV_PATCH_MASK, scpi_info->firmware_version)); FIELD_GET(PROTO_REV_MAJOR_MASK,
scpi_info->protocol_version),
FIELD_GET(PROTO_REV_MINOR_MASK,
scpi_info->protocol_version),
FIELD_GET(FW_REV_MAJOR_MASK,
scpi_info->firmware_version),
FIELD_GET(FW_REV_MINOR_MASK,
scpi_info->firmware_version),
FIELD_GET(FW_REV_PATCH_MASK,
scpi_info->firmware_version));
scpi_info->scpi_ops = &scpi_ops; scpi_info->scpi_ops = &scpi_ops;
ret = devm_device_add_groups(dev, versions_groups); ret = devm_device_add_groups(dev, versions_groups);