Skip to content

[Deepin-Kernel-SIG][linux 6.6-y]scsi: linkdata: update ps3stor to 2.9.0.12 - #2271

Merged
opsiff merged 2 commits into
deepin-community:linux-6.6.yfrom
liujie5linkdata:linux-6.6_ps3stor_2.9.12
Nov 19, 2026
Merged

opsiff merged 2 commits into
deepin-community:linux-6.6.yfrom
liujie5linkdata:linux-6.6_ps3stor_2.9.12

Conversation

@liujie5linkdata

@liujie5linkdata liujie5linkdata commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Sync the Linkdata ps3stor HBA/RAID driver (2.9.0.12). This replaces the previous 2.3.1.24 integration.

Adopt the upstream in-tree layout drivers/scsi/linkdata/ps3stor/ and the Kconfig symbol SCSI_PS3STOR (depends on PCI && SCSI; select SCSI_SAS_ATTRS, RAID_ATTRS, IRQ_POLL). Drop out-of-tree-only files (dkms.conf, build/load scripts, error-injection sources)

Update the x86, arm64 and loongarch deepin desktop defconfigs to the new symbol, and document the ps3stor module parameters in Documentation/admin-guide/kernel-parameters.txt.

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @liujie5linkdata, this pull request is too large to review

It changes 113,032 lines. Sourcery can review pull requests with up to 20,000 changed lines.

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign dongert for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot

Copy link
Copy Markdown

Hi @liujie5linkdata. Thanks for your PR. 😃

@deepin-ci-robot

Copy link
Copy Markdown

Hi @liujie5linkdata. Thanks for your PR.

I'm waiting for a deepin-community member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Update the Linkdata ps3stor HBA/RAID driver to version 2.9.0.12
(build b6529a9 9146769, Jul 28 2026), replacing the previous 2.3.1.24
integration.

Reorganize the driver into the in-tree layout
drivers/scsi/linkdata/ps3stor/ and rename the Kconfig symbol to
SCSI_PS3STOR (depends on PCI && SCSI; select SCSI_SAS_ATTRS,
RAID_ATTRS, IRQ_POLL). Drop out-of-tree-only files (dkms.conf,
build/load scripts, error-injection sources) that are not needed for
the in-tree build.

Update the x86, arm64 and loongarch deepin desktop defconfigs to the
new symbol, and document the ps3stor module parameters in
Documentation/admin-guide/kernel-parameters.txt.

The module name remains ps3stor.ko, so module loading and initramfs
generation are unaffected by the directory reorganization. Custom
kernel configs carried over via oldconfig need to re-enable
SCSI_PS3STOR, as the previous SCSI_LINKDATA_PS3STOR symbol is removed.

Signed-off-by: liujie5 <liujie5@linkdatatechnology.com>
@liujie5linkdata
liujie5linkdata force-pushed the linux-6.6_ps3stor_2.9.12 branch from 2700c7c to ce5480a Compare November 19, 2026 07:16
@liujie5linkdata liujie5linkdata changed the title scsi: linkdata: update ps3stor to 2.9.0.12 [Deepin-Kernel-SIG][linux 6.6-y]scsi: linkdata: update ps3stor to 2.9.0.12 Nov 19, 2026
@liujie5linkdata

Copy link
Copy Markdown
Contributor Author

/ok_to_test

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

The parameter documentation incorrectly lists a default of 0, while the shipped build enables shared host tagsets by default with a value of 1.

1 open issue
What changed in this PR

Updates the Linkdata ps3stor HBA/RAID driver from 2.3.1.24 to 2.9.0.12 and reorganizes its integration into the kernel SCSI subsystem.

Changes:

  • Moves the driver into drivers/scsi/linkdata/ps3stor/, refreshes interfaces, and adopts CONFIG_SCSI_PS3STOR.
  • Removes legacy headers, standalone installation scripts, DKMS configuration, and error-injection interfaces.
  • Updates desktop defconfigs for x86, arm64, and loongarch and documents module parameters.
File Description
drivers/​scsi/​Makefile Uses the new configuration symbol.
drivers/​scsi/​linkdata/​uload.sh Removes standalone unload script.
drivers/​scsi/​linkdata/​readme.txt Removes standalone build instructions.
drivers/​scsi/​linkdata/​ramfs_install.sh Removes standalone initramfs installation script.
drivers/​scsi/​linkdata/​ps3stor/​ps3_watchdog.h Refreshes watchdog declarations and types.
drivers/​scsi/​linkdata/​ps3stor/​ps3_trace_id_alloc.h Relocates trace-ID allocation interface.
drivers/​scsi/​linkdata/​ps3stor/​ps3_trace_id_alloc.c Updates trace-ID types and includes.
drivers/​scsi/​linkdata/​ps3stor/​ps3_scsih.h Refreshes SCSI command interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_scsih_raid_engine.h Relocates RAID mapping interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_scsih_cmd_parse.h Refreshes SCSI command parsing interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_scsi_cmd_err.h Updates SCSI error-handling declarations.
drivers/​scsi/​linkdata/​ps3stor/​ps3_sas_transport.h Refreshes SAS transport interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_recovery.h Updates recovery state and reset interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_r1x_write_lock.h Relocates mirrored-write locking interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_pci.h Refreshes PCI access declarations.
drivers/​scsi/​linkdata/​ps3stor/​ps3_nvme_resp_to_scsi.h Updates NVMe-to-SCSI response types.
drivers/​scsi/​linkdata/​ps3stor/​ps3_module_para.h Refreshes module-parameter accessors.
drivers/​scsi/​linkdata/​ps3stor/​ps3_mgr_cmd.h Updates management-command interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_mgr_cmd_err.h Refreshes management error interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_mgr_channel.h Adds synchronous command-wait declaration.
drivers/​scsi/​linkdata/​ps3stor/​ps3_load.h Updates firmware initialization return type.
drivers/​scsi/​linkdata/​ps3stor/​ps3_kernel_version.h Defines supported kernel API features.
drivers/​scsi/​linkdata/​ps3stor/​ps3_ioctl.h Refreshes ioctl types and helpers.
drivers/​scsi/​linkdata/​ps3stor/​ps3_ioc_state.h Relocates controller-state interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_io_trace.h Refreshes I/O tracing interface.
drivers/​scsi/​linkdata/​ps3stor/​ps3_io_trace.c Relocates and updates tracing implementation.
drivers/​scsi/​linkdata/​ps3stor/​ps3_event.h Updates event-handling declarations.
drivers/​scsi/​linkdata/​ps3stor/​ps3_err_def.h Refreshes driver error definitions.
drivers/​scsi/​linkdata/​ps3stor/​ps3_dump.h Relocates dump structures and interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_drv_ver.h Records driver version 2.9.0.12.
drivers/​scsi/​linkdata/​ps3stor/​ps3_device_update.h Refreshes device-update interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_device_manager_sas.h Updates SAS device-management declarations.
drivers/​scsi/​linkdata/​ps3stor/​ps3_debug.h Refreshes debugging interfaces.
drivers/​scsi/​linkdata/​ps3stor/​ps3_cmd_complete.h Relocates command-completion declarations.
drivers/​scsi/​linkdata/​ps3stor/​Makefile Defines module objects and compiler flags.
drivers/​scsi/​linkdata/​ps3stor/​linux/​ps3_pcie_err_handle.h Adds PCI initialization lifecycle declarations.
drivers/​scsi/​linkdata/​ps3stor/​linux/​ps3_cli.h Refreshes CLI callback declarations.
drivers/​scsi/​linkdata/​ps3stor/​linux/​ps3_cli_debug.h Removes error-injection declaration.
drivers/​scsi/​linkdata/​ps3stor/​Kconfig Defines driver option and dependencies.
drivers/​scsi/​linkdata/​ps3stor/​include/​ps3_mgr_evt_common.h Relocates common event definitions.
drivers/​scsi/​linkdata/​ps3stor/​include/​ps3_htp_trace_id.h Provides hardware trace-ID helpers.
drivers/​scsi/​linkdata/​ps3stor/​include/​ps3_htp_register_fifo.h Refreshes register and FIFO structures.
drivers/​scsi/​linkdata/​ps3stor/​include/​ps3_htp_mgr_evt.h Provides compact event-filter structure.
drivers/​scsi/​linkdata/​ps3stor/​include/​ps3_htp_meta.h Refreshes disk and RAID metadata definitions.
drivers/​scsi/​linkdata/​ps3stor/​include/​ps3_htp_dev_info.h Refreshes device classification definitions.
drivers/​scsi/​linkdata/​ps3stor/​include/​hwapi/​include_v200/​s1861_regs/​s1861_hil_reg0_ps3_register_s_reg.h Updates shared-register types and macros.
drivers/​scsi/​linkdata/​ps3stor/​include/​hwapi/​include_v200/​s1861_regs/​s1861_global_baseaddr.h Relocates hardware address constants.
drivers/​scsi/​linkdata/​ps3stor/​include/​htp_v200/​ps3_htp_req_frame_hw.h Refreshes NVMe request-frame types.
drivers/​scsi/​linkdata/​ps3stor/​include/​htp_v200/​ps3_htp_pci.h Adds TL PCI identifiers.
drivers/​scsi/​linkdata/​ps3stor/​include/​htp_v200/​ps3_htp_ioctl.h Refreshes ioctl protocol structures.
drivers/​scsi/​linkdata/​ps3stor/​include/​htp_v200/​ps3_htp_event.h Simplifies event protocol definitions.
drivers/​scsi/​linkdata/​ps3_trace_id_alloc.h Removes superseded trace-ID header.
drivers/​scsi/​linkdata/​ps3_scsih.h Removes superseded SCSI interface header.
drivers/​scsi/​linkdata/​ps3_scsih_raid_engine.h Removes superseded RAID interface header.
drivers/​scsi/​linkdata/​ps3_scsih_cmd_parse.h Removes superseded command-parsing header.
drivers/​scsi/​linkdata/​ps3_scsi_cmd_err.h Removes superseded SCSI error header.
drivers/​scsi/​linkdata/​ps3_sas_transport.h Removes superseded SAS transport header.
drivers/​scsi/​linkdata/​ps3_recovery.h Removes superseded recovery header.
drivers/​scsi/​linkdata/​ps3_r1x_write_lock.h Removes superseded write-lock header.
drivers/​scsi/​linkdata/​ps3_pci.h Removes superseded PCI header.
drivers/​scsi/​linkdata/​ps3_nvme_resp_to_scsi.h Removes superseded response-conversion header.
drivers/​scsi/​linkdata/​ps3_module_para.h Removes superseded parameter header.
drivers/​scsi/​linkdata/​ps3_mgr_cmd.h Removes superseded management-command header.
drivers/​scsi/​linkdata/​ps3_mgr_cmd_err.h Removes superseded management-error header.
drivers/​scsi/​linkdata/​ps3_mgr_channel.h Removes superseded management-channel header.
drivers/​scsi/​linkdata/​ps3_ioc_state.h Removes superseded controller-state header.
drivers/​scsi/​linkdata/​ps3_io_trace.h Removes superseded tracing header.
drivers/​scsi/​linkdata/​ps3_io_trace.c Removes old tracing implementation location.
drivers/​scsi/​linkdata/​ps3_inject.h Removes error-injection interfaces.
drivers/​scsi/​linkdata/​ps3_event.h Removes superseded event header.
drivers/​scsi/​linkdata/​ps3_err_def.h Removes superseded error definitions.
drivers/​scsi/​linkdata/​ps3_dump.h Removes superseded dump header.
drivers/​scsi/​linkdata/​ps3_drv_ver.h Removes old version header.
drivers/​scsi/​linkdata/​ps3_drv_readme.txt Removes old release metadata.
drivers/​scsi/​linkdata/​ps3_drv_readme.sh Removes release-metadata generation script.
drivers/​scsi/​linkdata/​ps3_device_update.h Removes superseded device-update header.
drivers/​scsi/​linkdata/​ps3_device_manager_sas.h Removes superseded SAS management header.
drivers/​scsi/​linkdata/​ps3_debug.h Removes superseded debug header.
drivers/​scsi/​linkdata/​ps3_cmd_complete.h Removes superseded completion header.
drivers/​scsi/​linkdata/​Makefile Delegates compilation to ps3stor/.
drivers/​scsi/​linkdata/​load.sh Removes standalone loading script.
drivers/​scsi/​linkdata/​linux/​ps3_cli.h Removes superseded CLI header.
drivers/​scsi/​linkdata/​Kconfig Sources the relocated driver configuration.
drivers/​scsi/​linkdata/​include/​ps3_types.h Removes legacy type aliases.
drivers/​scsi/​linkdata/​include/​ps3_trace_id.h Removes superseded trace-ID definitions.
drivers/​scsi/​linkdata/​include/​ps3_register_fifo.h Removes superseded register structures.
drivers/​scsi/​linkdata/​include/​ps3_mgr_evt.h Removes legacy management-event interface.
drivers/​scsi/​linkdata/​include/​ps3_mgr_evt_common.h Removes old common-event definitions.
drivers/​scsi/​linkdata/​include/​ps3_meta.h Removes superseded metadata header.
drivers/​scsi/​linkdata/​include/​ps3_dev_type.h Removes superseded device-type header.
drivers/​scsi/​linkdata/​include/​ps3_define.h Removes legacy utility definitions.
drivers/​scsi/​linkdata/​include/​hwapi/​include_v200/​s1861_regs/​s1861_hil_reg0_ps3_register_s_reg.h Removes old shared-register header.
drivers/​scsi/​linkdata/​include/​hwapi/​include_v200/​s1861_regs/​s1861_global_baseaddr.h Removes old hardware-address header.
drivers/​scsi/​linkdata/​include/​htp_v200/​ps3_htp_req_frame_hw.h Removes old request-frame header.
drivers/​scsi/​linkdata/​include/​htp_v200/​ps3_htp_pci.h Removes old PCI identifier header.
drivers/​scsi/​linkdata/​include/​htp_v200/​ps3_htp_ioctl.h Removes old ioctl protocol header.
drivers/​scsi/​linkdata/​include/​htp_v200/​ps3_htp_event.h Removes old event protocol header.
drivers/​scsi/​linkdata/​dkms.conf Removes out-of-tree DKMS configuration.
drivers/​scsi/​linkdata/​clean.sh Removes standalone cleanup script.
Documentation/​admin-guide/​kernel-parameters.txt Documents ps3stor module parameters.
arch/​x86/​configs/​deepin_x86_desktop_defconfig Enables the renamed driver option.
arch/​loongarch/​configs/​deepin_loongarch_desktop_defconfig Enables the renamed driver option.
arch/​arm64/​configs/​deepin_arm64_desktop_defconfig Enables the renamed driver option.

Review effort: Balanced

The driver enables the shared host tagset by default
(g_ps3_tagset_enable = 1), but kernel-parameters.txt documented the
default as 0. Correct the documentation to match the code.

Signed-off-by: liujie5 <liujie5@linkdatatechnology.com>
@liujie5linkdata
liujie5linkdata force-pushed the linux-6.6_ps3stor_2.9.12 branch from 4f005d4 to c61bb48 Compare November 19, 2026 09:50
@opsiff
opsiff merged commit 29502a0 into deepin-community:linux-6.6.y Nov 19, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants