redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

nfc: s3fwrn5: skip the NFC bootloader mode 

If there isn't a proper NFC firmware image, Bootloader mode will be
skipped.

Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20201203225257.2446-1-bongsu.jeon@samsung.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
zero-sugar-mainline-defconfig
Bongsu Jeon 2020-12-04 07:52:57 +09:00 committed by Jakub Kicinski
parent 43be3a3c65
commit 4fb7b98c7b
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/nfc/s3fwrn5/core.c
View File

@ -20,13 +20,26 @@
NFC_PROTO_ISO14443_B_MASK | \
NFC_PROTO_ISO15693_MASK)
static int s3fwrn5_firmware_init(struct s3fwrn5_info *info)
{
struct s3fwrn5_fw_info *fw_info = &info->fw_info;
int ret;
s3fwrn5_fw_init(fw_info, "sec_s3fwrn5_firmware.bin");
/* Get firmware data */
ret = s3fwrn5_fw_request_firmware(fw_info);
if (ret < 0)
dev_err(&fw_info->ndev->nfc_dev->dev,
"Failed to get fw file, ret=%02x\n", ret);
return ret;
}
static int s3fwrn5_firmware_update(struct s3fwrn5_info *info)
{
bool need_update;
int ret;
s3fwrn5_fw_init(&info->fw_info, "sec_s3fwrn5_firmware.bin");
/* Update firmware */
s3fwrn5_set_wake(info, false);
@ -109,6 +122,12 @@ static int s3fwrn5_nci_post_setup(struct nci_dev *ndev)
struct s3fwrn5_info *info = nci_get_drvdata(ndev);
int ret;
if (s3fwrn5_firmware_init(info)) {
//skip bootloader mode
ret = 0;
goto out;
}
ret = s3fwrn5_firmware_update(info);
if (ret < 0)
goto out;

11
drivers/nfc/s3fwrn5/firmware.c
View File

@ -280,7 +280,7 @@ static int s3fwrn5_fw_complete_update_mode(struct s3fwrn5_fw_info *fw_info)
#define S3FWRN5_FW_IMAGE_HEADER_SIZE 44
static int s3fwrn5_fw_request_firmware(struct s3fwrn5_fw_info *fw_info)
int s3fwrn5_fw_request_firmware(struct s3fwrn5_fw_info *fw_info)
{
struct s3fwrn5_fw_image *fw = &fw_info->fw;
u32 sig_off;
@ -358,15 +358,6 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info)
struct s3fwrn5_fw_cmd_get_bootinfo_rsp bootinfo;
int ret;
/* Get firmware data */
ret = s3fwrn5_fw_request_firmware(fw_info);
if (ret < 0) {
dev_err(&fw_info->ndev->nfc_dev->dev,
"Failed to get fw file, ret=%02x\n", ret);
return ret;
}
/* Get bootloader info */
ret = s3fwrn5_fw_get_bootinfo(fw_info, &bootinfo);

1
drivers/nfc/s3fwrn5/firmware.h
View File

@ -89,6 +89,7 @@ struct s3fwrn5_fw_info {
char parity;
};
int s3fwrn5_fw_request_firmware(struct s3fwrn5_fw_info *fw_info);
void s3fwrn5_fw_init(struct s3fwrn5_fw_info *fw_info, const char *fw_name);
int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info);
bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version);