Answers below.

________________________________
From: <email address hidden> <email address hidden> on behalf of Michael Reed <email address hidden>
Sent: Wednesday, April 19, 2023 12:21 PM
To: Don Brace - C33706 <email address hidden>
Subject: [Bug 1998643] Re: smartpqi: Update 22.04 driver to include recent bug fixes and support current generation devices

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Hi Don,

Here are the changes I made to the second patch

c1ea387d998a scsi: smartpqi: Stop using the SCSI pointer

drivers/scsi/smartpqi/smartpqi_init.c
@@ -7256,8 +7265,9 @@ static struct scsi_host_template pqi_driver_template = {
        .slave_alloc = pqi_slave_alloc,
        .slave_configure = pqi_slave_configure,
        .map_queues = pqi_map_queues,
-       .sdev_attrs = pqi_sdev_attrs,
-       .shost_attrs = pqi_shost_attrs,
+       .sdev_groups = pqi_sdev_groups,
+       .shost_groups = pqi_shost_groups,
+       .cmd_size = sizeof(struct pqi_cmd_priv),
 };


The issue here is that the added lines cause the build to break.  If I didn't add

+       .sdev_groups = pqi_sdev_groups,
+       .shost_groups = pqi_shost_groups,

and keep

-       .sdev_attrs = pqi_sdev_attrs,
-       .shost_attrs = pqi_shost_attrs,

My guess is that it will build.  I haven't tried it yet but wanted some
guidance.
DON>>>>
That will work.

Great job. This is due to the following patch not applied.
patch "(64fc9015fbeb scsi: smartpqi: Switch to attribute groups)"


--
You received this bug notification because you are subscribed to the bug
report.
https://bugs.launchpad.net/bugs/1998643

Title:
  smartpqi: Update 22.04 driver to include recent bug fixes and support
  current generation devices

Status in linux package in Ubuntu:
  In Progress
Status in linux source package in Jammy:
  Incomplete

Bug description:
  [Impact]
  These patches provide bug fixes and add support for the latest generation of OEM PCI devices to ensure customers are able to use Jammy on the recent generations of server hardware. This will bring us in line with the other major linux distros.

  [Fix]
  There are some outstanding patches already in Linus's tree that can be applied to 22.04.
  git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

  The following patches apply to
  https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/jammy

  f54f85dfd757 scsi: smartpqi: Update version to 2.1.18-045
  e4b73b3fa2b9 scsi: smartpqi: Update copyright to current year
  6d567dfee0b7 scsi: smartpqi: Add ctrl ready timeout module parameter
  2d80f4054f7f scsi: smartpqi: Update deleting a LUN via sysfs
  cf15c3e734e8 scsi: smartpqi: Add module param to disable managed ints
  6ce3cfb365eb scsi: smartpqi: Fix RAID map race condition
  69695aeaa662 scsi: smartpqi: Fix DMA direction for RAID requests
  85b41834b0f4 scsi: smartpqi: Stop logging spurious PQI reset failures
  2a9c2ba2bc47 scsi: smartpqi: Add PCI IDs for Lenovo controllers
  44e68c4af5d2 scsi: smartpqi: Add PCI ID for Adaptec SmartHBA 2100-8i
  331f7e998b20 scsi: smartpqi: Fix PCI control linkdown system hang
  904f2bfda65e scsi: smartpqi: Add driver support for multi-LUN devices
  297bdc540f0e scsi: smartpqi: Close write read holes
  dab5378485f6 scsi: smartpqi: Add PCI IDs for ramaxel controllers
  1d393227fc76 scsi: smartpqi: Add controller fw version to console log
  4e7d26029ee7 scsi: smartpqi: Shorten drive visibility after removal
  8946ea283808 scsi: smartpqi: Fix typo in comment
  c1ea387d998a scsi: smartpqi: Stop using the SCSI pointer
  31b17c3aeb5e scsi: smartpqi: Fix unused variable pqi_pm_ops for clang
  62ed6622aaf0 scsi: smartpqi: Update version to 2.1.14-035
  291c2e0071ef scsi: smartpqi: Fix lsscsi -t SAS addresses
  c66e078ad89e scsi: smartpqi: Fix hibernate and suspend
  5e6935864d81 scsi: smartpqi: Fix BUILD_BUG_ON() statements
  c52efc923856 scsi: smartpqi: Fix NUMA node not updated during init
  00598b056aa6 scsi: smartpqi: Expose SAS address for SATA drives
  5d8fbce04d36 scsi: smartpqi: Speed up RAID 10 sequential reads
  27655e9db479 scsi: smartpqi: Update volume size after expansion
  b73357a1fd39 scsi: smartpqi: Avoid drive spin-down during suspend
  42dc0426fbbb scsi: smartpqi: Resolve delay issue with PQI_HZ value
  9e98e60bfca3 scsi: smartpqi: Fix a typo in func pqi_aio_submit_io()
  b4dc06a9070e scsi: smartpqi: Fix a name typo and cleanup code
  94a68c814328 scsi: smartpqi: Quickly propagate path failures to SCSI midlayer
  70ba20be4bb1 scsi: smartpqi: Eliminate drive spin down on warm boot
  2a47834d9452 scsi: smartpqi: Enable SATA NCQ priority in sysfs
  c57ee4ccb358 scsi: smartpqi: Add PCI IDs
  c4ff687d25c0 scsi: smartpqi: Fix rmmod stack trace
  64fc9015fbeb scsi: smartpqi: Switch to attribute groups
  0ca190805784 scsi: smartpqi: Call scsi_done() directly

  I added the above SHA1 IDs to a file called:
  backport_linus_6.1_into_22.04

  git-backport --sort -d /tmp/patches ../backport_linus_6.1_into_22.04
  git am -s /tmp/patches/*.diff

  All patches applied without any conflicts.

  [Test Plan]
  The upstream driver has undergone extensive testing by Microchip's test team before submitting those patches to the upstream kernel. All patches are tested and accepted in the upstream kernel at this time.

  One should be able to load the smartpqi driver and verify the version
  is at 2.1.18-045

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1998643/+subscriptions