RE: [PATCH v3 1/2] Bluetooth: btintel: Define macros for image types

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Luiz,

> -----Original Message-----
> From: Luiz Augusto von Dentz <luiz.dentz@xxxxxxxxx>
> Sent: Wednesday, March 6, 2024 4:13 AM
> To: K, Kiran <kiran.k@xxxxxxxxx>
> Cc: linux-bluetooth@xxxxxxxxxxxxxxx; Srivatsa, Ravishankar
> <ravishankar.srivatsa@xxxxxxxxx>; Tumkur Narayan, Chethan
> <chethan.tumkur.narayan@xxxxxxxxx>
> Subject: Re: [PATCH v3 1/2] Bluetooth: btintel: Define macros for image types
> 
> Hi Kiran,
> 
> On Tue, Mar 5, 2024 at 9:38 AM Kiran K <kiran.k@xxxxxxxxx> wrote:
> >
> > Use macro for image type instead of using hard code number.
> >
> > Signed-off-by: Kiran K <kiran.k@xxxxxxxxx>
> > ---
> >  drivers/bluetooth/btintel.c | 12 ++++++------
> > drivers/bluetooth/btintel.h |  3 +++
> >  2 files changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
> > index 6ba7f5d1b837..ed98bb867cff 100644
> > --- a/drivers/bluetooth/btintel.c
> > +++ b/drivers/bluetooth/btintel.c
> > @@ -489,7 +489,7 @@ static int btintel_version_info_tlv(struct hci_dev
> *hdev,
> >         }
> >
> >         switch (version->img_type) {
> > -       case 0x01:
> > +       case IMG_BOOTLOADER:
> >                 variant = "Bootloader";
> >                 /* It is required that every single firmware fragment is
> acknowledged
> >                  * with a command complete event. If the boot
> > parameters indicate @@ -521,7 +521,7 @@ static int
> btintel_version_info_tlv(struct hci_dev *hdev,
> >                             version->min_fw_build_nn, version->min_fw_build_cw,
> >                             2000 + version->min_fw_build_yy);
> >                 break;
> > -       case 0x03:
> > +       case IMG_OP:
> >                 variant = "Firmware";
> >                 break;
> >         default:
> > @@ -535,7 +535,7 @@ static int btintel_version_info_tlv(struct hci_dev
> *hdev,
> >         bt_dev_info(hdev, "%s timestamp %u.%u buildtype %u build %u",
> variant,
> >                     2000 + (version->timestamp >> 8), version->timestamp & 0xff,
> >                     version->build_type, version->build_num);
> > -       if (version->img_type == 0x03)
> > +       if (version->img_type == IMG_OP)
> >                 bt_dev_info(hdev, "Firmware SHA1: 0x%8.8x",
> > version->git_sha1);
> >
> >         return 0;
> > @@ -1172,7 +1172,7 @@ static int btintel_download_fw_tlv(struct hci_dev
> *hdev,
> >          * If the firmware version has changed that means it needs to be reset
> >          * to bootloader when operational so the new firmware can be loaded.
> >          */
> > -       if (ver->img_type == 0x03)
> > +       if (ver->img_type == IMG_OP)
> >                 return -EINVAL;
> >
> >         /* iBT hardware variants 0x0b, 0x0c, 0x11, 0x12, 0x13, 0x14
> > support @@ -2230,7 +2230,7 @@ static int
> btintel_prepare_fw_download_tlv(struct hci_dev *hdev,
> >          * It is not possible to use the Secure Boot Parameters in this
> >          * case since that command is only available in bootloader mode.
> >          */
> > -       if (ver->img_type == 0x03) {
> > +       if (ver->img_type == IMG_OP) {
> >                 btintel_clear_flag(hdev, INTEL_BOOTLOADER);
> >                 btintel_check_bdaddr(hdev);
> >         } else {
> > @@ -2600,7 +2600,7 @@ static int btintel_bootloader_setup_tlv(struct
> hci_dev *hdev,
> >                 return err;
> >
> >         /* check if controller is already having an operational firmware */
> > -       if (ver->img_type == 0x03)
> > +       if (ver->img_type == IMG_OP)
> >                 goto finish;
> >
> >         err = btintel_boot(hdev, boot_param); diff --git
> > a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index
> > d19fcdb9ff0b..52b2f1986f85 100644
> > --- a/drivers/bluetooth/btintel.h
> > +++ b/drivers/bluetooth/btintel.h
> > @@ -51,6 +51,9 @@ struct intel_tlv {
> >         u8 val[];
> >  } __packed;
> >
> > +#define IMG_BOOTLOADER         0x01    /* Bootloader image */
> > +#define IMG_OP                 0x03    /* Operational image */
> 
> Lets prefix these with BTINTEL.

Ack.

> 
> >  struct intel_version_tlv {
> >         u32     cnvi_top;
> >         u32     cnvr_top;
> > --
> > 2.34.1
> >
> >
> 
> 
> --
> Luiz Augusto von Dentz

Thanks,
Kiran




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux