2020-12-03 22:56:37

by Bongsu Jeon

Subject: [PATCH v2 net-next] nfc: s3fwrn5: skip the NFC bootloader mode

From: Bongsu Jeon <[email protected]>

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

Signed-off-by: Bongsu Jeon <[email protected]>
---

ChangeLog:
v2:
- change the commit message.
- change the skip handling code.

drivers/nfc/s3fwrn5/core.c | 23 +++++++++++++++++++++--
drivers/nfc/s3fwrn5/firmware.c | 11 +----------
drivers/nfc/s3fwrn5/firmware.h | 1 +
3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/drivers/nfc/s3fwrn5/core.c b/drivers/nfc/s3fwrn5/core.c
index f8e5d78d9078..c00b7a07c3ee 100644
--- a/drivers/nfc/s3fwrn5/core.c
+++ b/drivers/nfc/s3fwrn5/core.c
@@ -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;
diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c
index 4cde6dd5c019..4b5352e2b915 100644
--- a/drivers/nfc/s3fwrn5/firmware.c
+++ b/drivers/nfc/s3fwrn5/firmware.c
@@ -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);
diff --git a/drivers/nfc/s3fwrn5/firmware.h b/drivers/nfc/s3fwrn5/firmware.h
index 3c83e6730d30..3a82ce5837fb 100644
--- a/drivers/nfc/s3fwrn5/firmware.h
+++ b/drivers/nfc/s3fwrn5/firmware.h
@@ -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);
--
2.17.1

2020-12-04 08:43:07

by Krzysztof Kozlowski

Subject: Re: [PATCH v2 net-next] nfc: s3fwrn5: skip the NFC bootloader mode

On Fri, Dec 04, 2020 at 07:52:57AM +0900, Bongsu Jeon wrote:
> From: Bongsu Jeon <[email protected]>
>
> If there isn't a proper NFC firmware image, Bootloader mode will be
> skipped.
>
> Signed-off-by: Bongsu Jeon <[email protected]>
> ---
>
> ChangeLog:
> v2:
> - change the commit message.
> - change the skip handling code.

Patch is now much cleaner and smaller. Thanks.

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

>
> drivers/nfc/s3fwrn5/core.c | 23 +++++++++++++++++++++--
> drivers/nfc/s3fwrn5/firmware.c | 11 +----------
> drivers/nfc/s3fwrn5/firmware.h | 1 +
> 3 files changed, 23 insertions(+), 12 deletions(-)

2020-12-04 23:35:22

by Jakub Kicinski

Subject: Re: [PATCH v2 net-next] nfc: s3fwrn5: skip the NFC bootloader mode

On Fri, 4 Dec 2020 10:37:53 +0200 Krzysztof Kozlowski wrote:
> On Fri, Dec 04, 2020 at 07:52:57AM +0900, Bongsu Jeon wrote:
> > From: Bongsu Jeon <[email protected]>
> >
> > If there isn't a proper NFC firmware image, Bootloader mode will be
> > skipped.
> >
> > Signed-off-by: Bongsu Jeon <[email protected]>
> > ---
> >
> > ChangeLog:
> > v2:
> > - change the commit message.
> > - change the skip handling code.
>
> Patch is now much cleaner and smaller. Thanks.
>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>

Applied, thanks!