From: Martin Wilck <mwilck@suse.com>
To: Don Brace <don.brace@microchip.com>,
Kevin.Barnett@microchip.com, scott.teel@microchip.com,
Justin.Lindley@microchip.com, scott.benesh@microchip.com,
gerry.morong@microchip.com, mahesh.rajashekhara@microchip.com,
hch@infradead.org, jejb@linux.vnet.ibm.com,
joseph.szczypek@hpe.com, POSWALD@suse.com
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH V3 08/25] smartpqi: add support for long firmware version
Date: Thu, 07 Jan 2021 17:45:11 +0100 [thread overview]
Message-ID: <e83150ef31a885a3374e287a2a7fc31967c757bc.camel@suse.com> (raw)
In-Reply-To: <160763250690.26927.15055129460333690813.stgit@brunhilda>
On Thu, 2020-12-10 at 14:35 -0600, Don Brace wrote:
> From: Kevin Barnett <kevin.barnett@microchip.com>
>
> * Add support for new "long" firmware version which requires
> minor driver changes to expose.
>
> Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
> Reviewed-by: Scott Teel <scott.teel@microchip.com>
> Signed-off-by: Kevin Barnett <kevin.barnett@microchip.com>
> Signed-off-by: Don Brace <don.brace@microchip.com>
> ---
> drivers/scsi/smartpqi/smartpqi.h | 14 ++++++++---
> drivers/scsi/smartpqi/smartpqi_init.c | 42
> ++++++++++++++++++++++++---------
> 2 files changed, 40 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/scsi/smartpqi/smartpqi.h
> b/drivers/scsi/smartpqi/smartpqi.h
> index eb23c3cf59c0..f33244def944 100644
> --- a/drivers/scsi/smartpqi/smartpqi.h
> +++ b/drivers/scsi/smartpqi/smartpqi.h
> @@ -1227,7 +1227,7 @@ struct pqi_event {
> struct pqi_ctrl_info {
> unsigned int ctrl_id;
> struct pci_dev *pci_dev;
> - char firmware_version[11];
> + char firmware_version[32];
> char serial_number[17];
> char model[17];
> char vendor[9];
> @@ -1405,7 +1405,7 @@ enum pqi_ctrl_mode {
> struct bmic_identify_controller {
> u8 configured_logical_drive_count;
> __le32 configuration_signature;
> - u8 firmware_version[4];
> + u8 firmware_version_short[4];
> u8 reserved[145];
> __le16 extended_logical_unit_count;
> u8 reserved1[34];
> @@ -1413,11 +1413,17 @@ struct bmic_identify_controller {
> u8 reserved2[8];
> u8 vendor_id[8];
> u8 product_id[16];
> - u8 reserved3[68];
> + u8 reserved3[62];
> + __le32 extra_controller_flags;
> + u8 reserved4[2];
> u8 controller_mode;
> - u8 reserved4[32];
> + u8 spare_part_number[32];
> + u8 firmware_version_long[32];
> };
>
> +/* constants for extra_controller_flags field of
> bmic_identify_controller */
> +#define
> BMIC_IDENTIFY_EXTRA_FLAGS_LONG_FW_VERSION_SUPPORTED 0x20000000
> +
> struct bmic_sense_subsystem_info {
> u8 reserved[44];
> u8 ctrl_serial_number[16];
> diff --git a/drivers/scsi/smartpqi/smartpqi_init.c
> b/drivers/scsi/smartpqi/smartpqi_init.c
> index 419887aa8ff3..aa8b559e8907 100644
> --- a/drivers/scsi/smartpqi/smartpqi_init.c
> +++ b/drivers/scsi/smartpqi/smartpqi_init.c
> @@ -998,14 +998,12 @@ static void pqi_update_time_worker(struct
> work_struct *work)
> PQI_UPDATE_TIME_WORK_INTERVAL);
> }
>
> -static inline void pqi_schedule_update_time_worker(
> - struct pqi_ctrl_info *ctrl_info)
> +static inline void pqi_schedule_update_time_worker(struct
> pqi_ctrl_info *ctrl_info)
> {
> schedule_delayed_work(&ctrl_info->update_time_work, 0);
> }
>
> -static inline void pqi_cancel_update_time_worker(
> - struct pqi_ctrl_info *ctrl_info)
> +static inline void pqi_cancel_update_time_worker(struct
> pqi_ctrl_info *ctrl_info)
> {
> cancel_delayed_work_sync(&ctrl_info->update_time_work);
> }
> @@ -7245,13 +7243,23 @@ static int
> pqi_get_ctrl_product_details(struct pqi_ctrl_info *ctrl_info)
> if (rc)
> goto out;
>
> - memcpy(ctrl_info->firmware_version, identify-
> > firmware_version,
> - sizeof(identify->firmware_version));
> - ctrl_info->firmware_version[sizeof(identify-
> > firmware_version)] = '\0';
> - snprintf(ctrl_info->firmware_version +
> - strlen(ctrl_info->firmware_version),
> - sizeof(ctrl_info->firmware_version),
> - "-%u", get_unaligned_le16(&identify-
> > firmware_build_number));
> + if (get_unaligned_le32(&identify->extra_controller_flags) &
> + BMIC_IDENTIFY_EXTRA_FLAGS_LONG_FW_VERSION_SUPPORTED)
> {
> + memcpy(ctrl_info->firmware_version,
> + identify->firmware_version_long,
> + sizeof(identify->firmware_version_long));
> + } else {
> + memcpy(ctrl_info->firmware_version,
> + identify->firmware_version_short,
> + sizeof(identify->firmware_version_short));
> + ctrl_info->firmware_version
> + [sizeof(identify->firmware_version_short)] =
> '\0';
> + snprintf(ctrl_info->firmware_version +
> + strlen(ctrl_info->firmware_version),
> + sizeof(ctrl_info->firmware_version),
This looks wrong. I suppose a real overflow can't happen, but shouldn't
it rather be written like this?
snprintf(ctrl_info->firmware_version +
sizeof(identify->firmware_version_short),
sizeof(ctrl_info->firmware_version)
- sizeof(identify->firmware_version_short),
"-u", ...)
> + "-%u",
> + get_unaligned_le16(&identify-
> > firmware_build_number));
> + }
>
> memcpy(ctrl_info->model, identify->product_id,
> sizeof(identify->product_id));
> @@ -9607,13 +9615,23 @@ static void __attribute__((unused))
> verify_structures(void)
> BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> configuration_signature) != 1);
> BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> - firmware_version) != 5);
> + firmware_version_short) != 5);
> BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> extended_logical_unit_count) != 154);
> BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> firmware_build_number) != 190);
> + BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> + vendor_id) != 200);
> + BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> + product_id) != 208);
> + BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> + extra_controller_flags) != 286);
> BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> controller_mode) != 292);
> + BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> + spare_part_number) != 293);
> + BUILD_BUG_ON(offsetof(struct bmic_identify_controller,
> + firmware_version_long) != 325);
>
> BUILD_BUG_ON(offsetof(struct bmic_identify_physical_device,
> phys_bay_in_box) != 115);
>
next prev parent reply other threads:[~2021-01-07 16:46 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 20:34 [PATCH V3 00/25] smartpqi updates Don Brace
2020-12-10 20:34 ` [PATCH V3 01/25] smartpqi: add support for product id Don Brace
2021-01-07 16:43 ` Martin Wilck
2020-12-10 20:34 ` [PATCH V3 02/25] smartpqi: refactor aio submission code Don Brace
2021-01-07 16:43 ` Martin Wilck
2020-12-10 20:34 ` [PATCH V3 03/25] smartpqi: refactor build sg list code Don Brace
2021-01-07 16:43 ` Martin Wilck
2020-12-10 20:34 ` [PATCH V3 04/25] smartpqi: add support for raid5 and raid6 writes Don Brace
2021-01-07 16:44 ` Martin Wilck
2021-01-08 22:56 ` Don.Brace
2021-01-13 10:26 ` Martin Wilck
2020-12-10 20:34 ` [PATCH V3 05/25] smartpqi: add support for raid1 writes Don Brace
2021-01-07 16:44 ` Martin Wilck
2021-01-09 16:56 ` Don.Brace
2020-12-10 20:34 ` [PATCH V3 06/25] smartpqi: add support for BMIC sense feature cmd and feature bits Don Brace
2021-01-07 16:44 ` Martin Wilck
2021-01-11 17:22 ` Don.Brace
2021-01-22 16:45 ` Don.Brace
2021-01-22 19:04 ` Martin Wilck
2020-12-10 20:35 ` [PATCH V3 07/25] smartpqi: update AIO Sub Page 0x02 support Don Brace
2021-01-07 16:44 ` Martin Wilck
2021-01-11 20:53 ` Don.Brace
2020-12-10 20:35 ` [PATCH V3 08/25] smartpqi: add support for long firmware version Don Brace
2021-01-07 16:45 ` Martin Wilck [this message]
2021-01-11 22:25 ` Don.Brace
2021-01-22 20:01 ` Don.Brace
2020-12-10 20:35 ` [PATCH V3 09/25] smartpqi: align code with oob driver Don Brace
2021-01-08 0:13 ` Martin Wilck
2020-12-10 20:35 ` [PATCH V3 10/25] smartpqi: add stream detection Don Brace
2021-01-08 0:14 ` Martin Wilck
2021-01-15 21:58 ` Don.Brace
2020-12-10 20:35 ` [PATCH V3 11/25] smartpqi: add host level stream detection enable Don Brace
2021-01-08 0:13 ` Martin Wilck
2021-01-12 20:28 ` Don.Brace
2020-12-10 20:35 ` [PATCH V3 12/25] smartpqi: enable support for NVMe encryption Don Brace
2021-01-08 0:14 ` Martin Wilck
2020-12-10 20:35 ` [PATCH V3 13/25] smartpqi: disable write_same for nvme hba disks Don Brace
2021-01-08 0:13 ` Martin Wilck
2020-12-10 20:35 ` [PATCH V3 14/25] smartpqi: fix driver synchronization issues Don Brace
2021-01-07 23:32 ` Martin Wilck
2021-01-08 4:13 ` Martin K. Petersen
2021-01-15 21:13 ` Don.Brace
2021-01-27 23:01 ` Don.Brace
[not found] ` <c1e6b199f5ccda5ccec5223dfcbd1fba22171c86.camel@suse.com>
2021-02-01 22:47 ` Don.Brace
2020-12-10 20:35 ` [PATCH V3 15/25] smartpqi: fix host qdepth limit Don Brace
2020-12-14 17:54 ` Paul Menzel
2020-12-15 20:23 ` Don.Brace
2021-01-07 23:43 ` Martin Wilck
2021-01-15 21:17 ` Don.Brace
2021-01-19 10:33 ` John Garry
2021-01-19 14:12 ` Martin Wilck
2021-01-19 17:43 ` Paul Menzel
2021-01-20 16:42 ` Donald Buczek
2021-01-20 17:03 ` Don.Brace
2021-01-20 18:35 ` Martin Wilck
2021-02-10 15:27 ` Don.Brace
2021-02-10 15:42 ` John Garry
2021-02-10 16:29 ` Don.Brace
2021-03-29 21:15 ` Paul Menzel
2021-03-29 21:16 ` Paul Menzel
2021-03-30 14:37 ` Donald Buczek
2020-12-10 20:35 ` [PATCH V3 16/25] smartpqi: convert snprintf to scnprintf Don Brace
2021-01-07 23:51 ` Martin Wilck
2020-12-10 20:35 ` [PATCH V3 17/25] smartpqi: change timing of release of QRM memory during OFA Don Brace
2021-01-08 0:14 ` Martin Wilck
2021-01-27 17:46 ` Don.Brace
2020-12-10 20:36 ` [PATCH V3 18/25] smartpqi: return busy indication for IOCTLs when ofa is active Don Brace
2020-12-10 20:36 ` [PATCH V3 19/25] smartpqi: add phy id support for the physical drives Don Brace
2021-01-08 0:03 ` Martin Wilck
2020-12-10 20:36 ` [PATCH V3 20/25] smartpqi: update sas initiator_port_protocols and target_port_protocols Don Brace
2021-01-08 0:12 ` Martin Wilck
2020-12-10 20:36 ` [PATCH V3 21/25] smartpqi: add additional logging for LUN resets Don Brace
2021-01-08 0:27 ` Martin Wilck
2021-01-25 17:09 ` Don.Brace
2020-12-10 20:36 ` [PATCH V3 22/25] smartpqi: update enclosure identifier in sysf Don Brace
2021-01-08 0:30 ` Martin Wilck
2021-01-25 17:13 ` Don.Brace
2021-01-25 19:44 ` Martin Wilck
2021-01-25 20:36 ` Don.Brace
2020-12-10 20:36 ` [PATCH V3 23/25] smartpqi: correct system hangs when resuming from hibernation Don Brace
2021-01-08 0:34 ` Martin Wilck
2021-01-27 17:39 ` Don.Brace
2021-01-27 17:45 ` Martin Wilck
2020-12-10 20:36 ` [PATCH V3 24/25] smartpqi: add new pci ids Don Brace
2021-01-08 0:35 ` Martin Wilck
2020-12-10 20:36 ` [PATCH V3 25/25] smartpqi: update version to 2.1.6-005 Don Brace
2020-12-21 14:31 ` [PATCH V3 00/25] smartpqi updates Donald Buczek
[not found] ` <SN6PR11MB2848D8C9DF9856A2B7AA69ACE1C00@SN6PR11MB2848.namprd11.prod.outlook.com>
2020-12-22 13:13 ` Donald Buczek
2020-12-28 15:57 ` Don.Brace
2020-12-28 19:25 ` Don.Brace
2020-12-28 22:36 ` Donald Buczek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e83150ef31a885a3374e287a2a7fc31967c757bc.camel@suse.com \
--to=mwilck@suse.com \
--cc=Justin.Lindley@microchip.com \
--cc=Kevin.Barnett@microchip.com \
--cc=POSWALD@suse.com \
--cc=don.brace@microchip.com \
--cc=gerry.morong@microchip.com \
--cc=hch@infradead.org \
--cc=jejb@linux.vnet.ibm.com \
--cc=joseph.szczypek@hpe.com \
--cc=linux-scsi@vger.kernel.org \
--cc=mahesh.rajashekhara@microchip.com \
--cc=scott.benesh@microchip.com \
--cc=scott.teel@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).