-
Notifications
You must be signed in to change notification settings - Fork 52
kernel_npem: add support for kernel NPEM driver #270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
stuarthayes
wants to merge
5
commits into
md-raid-utilities:main
Choose a base branch
from
stuarthayes:kernel_npem
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ab09e6f
kernel_npem: add support for kernel NPEM driver
stuartwhayes 42a4436
kernel_npem: A few cosmetic changes
stuartwhayes 72bb5b8
Update slot support for kernel_npem
stuartwhayes 067f70e
Add KERNEL_NPEM controller type in two missed places
stuartwhayes 7088fe0
Update tests for KERNEL_NPEM
stuartwhayes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| // SPDX-License-Identifier: LGPL-2.1-or-later | ||
| // Copyright (C) 2022 Intel Corporation. | ||
| // Copyright (C) 2025 Dell Inc. | ||
|
|
||
| /* System headers */ | ||
| #include <stdio.h> | ||
| #include <string.h> | ||
| #include <pci/pci.h> | ||
| #include <time.h> | ||
| #include <stdbool.h> | ||
| #include <sys/stat.h> | ||
|
|
||
| /* Local headers */ | ||
| #include "libled_private.h" | ||
| #include "cntrl.h" | ||
| #include "npem.h" | ||
| #include "utils.h" | ||
|
|
||
| /* NPEM OK Capable/Control */ | ||
| #define PCI_NPEM_OK_CAP 0x004 | ||
| /* NPEM Locate Capable/Control */ | ||
| #define PCI_NPEM_LOCATE_CAP 0x008 | ||
| /* NPEM Fail Capable/Control */ | ||
| #define PCI_NPEM_FAIL_CAP 0x010 | ||
| /* NPEM Rebuild Capable/Control */ | ||
| #define PCI_NPEM_REBUILD_CAP 0x020 | ||
| /* NPEM Predicted Failure Analysis Capable/Control */ | ||
| #define PCI_NPEM_PFA_CAP 0x040 | ||
| /* NPEM Hot Spare Capable/Control */ | ||
| #define PCI_NPEM_HOT_SPARE_CAP 0x080 | ||
| /* NPEM in a Critical Array Capable/Control */ | ||
| #define PCI_NPEM_CRA_CAP 0x100 | ||
| /* NPEM in a Failed Array Capable/Control */ | ||
| #define PCI_NPEM_FA_CAP 0x200 | ||
|
|
||
| static const struct ibpi2value ibpi_to_npem_capability[] = { | ||
| {LED_IBPI_PATTERN_NORMAL, PCI_NPEM_OK_CAP}, | ||
| {LED_IBPI_PATTERN_ONESHOT_NORMAL, PCI_NPEM_OK_CAP}, | ||
| {LED_IBPI_PATTERN_DEGRADED, PCI_NPEM_CRA_CAP}, | ||
| {LED_IBPI_PATTERN_HOTSPARE, PCI_NPEM_HOT_SPARE_CAP}, | ||
| {LED_IBPI_PATTERN_REBUILD, PCI_NPEM_REBUILD_CAP}, | ||
| {LED_IBPI_PATTERN_FAILED_ARRAY, PCI_NPEM_FA_CAP}, | ||
| {LED_IBPI_PATTERN_PFA, PCI_NPEM_PFA_CAP}, | ||
| {LED_IBPI_PATTERN_FAILED_DRIVE, PCI_NPEM_FAIL_CAP}, | ||
| {LED_IBPI_PATTERN_LOCATE, PCI_NPEM_LOCATE_CAP}, | ||
| {LED_IBPI_PATTERN_LOCATE_OFF, PCI_NPEM_OK_CAP}, | ||
| {LED_IBPI_PATTERN_UNKNOWN, 0} | ||
| }; | ||
|
|
||
| struct kernel_npem_led { | ||
| int bitmask; | ||
| char *sysfs_led_name; | ||
| }; | ||
|
|
||
| const struct kernel_npem_led kernel_npem_leds[] = { | ||
| {PCI_NPEM_OK_CAP, "enclosure:ok"}, | ||
| {PCI_NPEM_LOCATE_CAP, "enclosure:locate"}, | ||
| {PCI_NPEM_FAIL_CAP, "enclosure:fail"}, | ||
| {PCI_NPEM_REBUILD_CAP, "enclosure:rebuild"}, | ||
| {PCI_NPEM_PFA_CAP, "enclosure:pfa"}, | ||
| {PCI_NPEM_HOT_SPARE_CAP, "enclosure:hotspare"}, | ||
| {PCI_NPEM_CRA_CAP, "enclosure:ica"}, | ||
| {PCI_NPEM_FA_CAP, "enclosure:ifa"}, | ||
| }; | ||
|
|
||
| char *kernel_npem_get_path(const char *cntrl_path) | ||
| { | ||
| return strdup(cntrl_path); | ||
| } | ||
|
|
||
| #define make_led_path(sysfs_led_path, sysfs_path, sysfs_led_name) \ | ||
| snprintf(sysfs_led_path, sizeof(sysfs_led_path), "%s/leds/%s:%s/brightness", \ | ||
| sysfs_path, basename(sysfs_path), sysfs_led_name) | ||
|
|
||
| static u32 read_kernel_npem_register(const char *sysfs_path) | ||
| { | ||
| char led_path[PATH_MAX]; | ||
| int i; | ||
| u32 reg = 0; | ||
|
|
||
| for (i = 0; i < ARRAY_SIZE(kernel_npem_leds); i++) { | ||
| make_led_path(led_path, sysfs_path, kernel_npem_leds[i].sysfs_led_name); | ||
| reg |= get_int("/", 0, led_path) ? kernel_npem_leds[i].bitmask : 0; | ||
| } | ||
| return reg; | ||
| } | ||
|
|
||
| static int write_kernel_npem_register(const char *sysfs_path, u32 val) | ||
| { | ||
| char led_path[PATH_MAX], val_text[4]; | ||
| int i; | ||
| struct stat sb; | ||
|
|
||
| for (i = 0; i < ARRAY_SIZE(kernel_npem_leds); i++) { | ||
| make_led_path(led_path, sysfs_path, kernel_npem_leds[i].sysfs_led_name); | ||
| snprintf(val_text, sizeof(val_text), val & kernel_npem_leds[i].bitmask ? "1" : "0"); | ||
| if (!stat(led_path, &sb)) | ||
| buf_write(led_path, val_text); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static u32 kernel_npem_supported_mask(const char *sysfs_path) | ||
| { | ||
| char led_path[PATH_MAX]; | ||
| int i; | ||
| struct stat sb; | ||
| u32 supported = 0; | ||
|
|
||
| for (i = 0; i < ARRAY_SIZE(kernel_npem_leds); i++) { | ||
| make_led_path(led_path, sysfs_path, kernel_npem_leds[i].sysfs_led_name); | ||
| if (!stat(led_path, &sb)) | ||
| supported |= kernel_npem_leds[i].bitmask; | ||
| } | ||
| return supported; | ||
| } | ||
|
|
||
| int is_kernel_npem_present(const char *path) | ||
| { | ||
| return kernel_npem_supported_mask(path) ? 1 : 0; | ||
| } | ||
|
|
||
| enum led_ibpi_pattern kernel_npem_get_state(struct slot_property *slot) | ||
| { | ||
| const char *path = slot->slot_spec.cntrl->sysfs_path; | ||
| const struct ibpi2value *ibpi2val; | ||
| u32 reg; | ||
|
|
||
| reg = read_kernel_npem_register(path); | ||
| ibpi2val = get_by_bits(reg, ibpi_to_npem_capability, | ||
| ARRAY_SIZE(ibpi_to_npem_capability)); | ||
|
|
||
| return ibpi2val->ibpi; | ||
| } | ||
|
|
||
| status_t kernel_npem_set_slot(struct led_ctx *ctx, const char *sysfs_path, | ||
| enum led_ibpi_pattern state) | ||
| { | ||
| const struct ibpi2value *ibpi2val; | ||
| u32 requested, supported; | ||
|
|
||
| ibpi2val = get_by_ibpi(state, ibpi_to_npem_capability, | ||
| ARRAY_SIZE(ibpi_to_npem_capability)); | ||
|
|
||
| if (ibpi2val->ibpi == LED_IBPI_PATTERN_UNKNOWN) { | ||
| lib_log(ctx, LED_LOG_LEVEL_INFO, | ||
| "KERNEL_NPEM: Controller doesn't support %s pattern\n", ibpi2str(state)); | ||
| return STATUS_INVALID_STATE; | ||
| } | ||
|
|
||
| requested = (u32)ibpi2val->value; | ||
| supported = kernel_npem_supported_mask(sysfs_path); | ||
|
|
||
| if (!(requested & supported)) | ||
| /* | ||
| * Allow OK (normal and locate_off states) to turn off other | ||
| * states even if OK state isn't actually supported. | ||
| */ | ||
| if (requested != PCI_NPEM_OK_CAP) { | ||
| lib_log(ctx, LED_LOG_LEVEL_INFO, | ||
| "KERNEL_NPEM: Controller %s doesn't support %s pattern\n", | ||
| sysfs_path, ibpi2str(state)); | ||
| return STATUS_INVALID_STATE; | ||
| } | ||
|
|
||
| write_kernel_npem_register(sysfs_path, requested); | ||
|
|
||
| return STATUS_SUCCESS; | ||
| } | ||
|
|
||
| status_t kernel_npem_set_state(struct slot_property *slot, enum led_ibpi_pattern state) | ||
| { | ||
| return kernel_npem_set_slot(slot->slot_spec.cntrl->ctx, | ||
| slot->slot_spec.cntrl->sysfs_path, state); | ||
| } | ||
|
|
||
| const struct slot_property_common kernel_npem_slot_common = { | ||
| .cntrl_type = LED_CNTRL_TYPE_KERNEL_NPEM, | ||
| .get_state_fn = kernel_npem_get_state, | ||
| .set_slot_fn = kernel_npem_set_state, | ||
| }; | ||
|
|
||
| struct slot_property *kernel_npem_slot_property_init(struct cntrl_device *kernel_npem_cntrl) | ||
| { | ||
| struct slot_property *result = calloc(1, sizeof(struct slot_property)); | ||
|
|
||
| if (result == NULL) | ||
| return NULL; | ||
|
|
||
| result->bl_device = get_block_device_from_sysfs_path(kernel_npem_cntrl->ctx, | ||
| kernel_npem_cntrl->sysfs_path, true); | ||
| result->slot_spec.cntrl = kernel_npem_cntrl; | ||
| snprintf(result->slot_id, PATH_MAX, "%s", kernel_npem_cntrl->sysfs_path); | ||
| result->c = &kernel_npem_slot_common; | ||
| return result; | ||
| } | ||
|
|
||
| status_t kernel_npem_write(struct block_device *device, enum led_ibpi_pattern ibpi) | ||
| { | ||
| if (ibpi < LED_IBPI_PATTERN_NORMAL || ibpi > LED_IBPI_PATTERN_LOCATE_OFF) | ||
| return STATUS_INVALID_STATE; | ||
|
|
||
| return kernel_npem_set_slot(device->cntrl->ctx, device->cntrl->sysfs_path, ibpi); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // SPDX-License-Identifier: LGPL-2.1-or-later | ||
| // Copyright (C) 2022 Intel Corporation. | ||
| // Copyright (C) 2025 Dell Inc. | ||
|
|
||
| #ifndef _KERNEL_NPEM_H_INCLUDED_ | ||
| #define _KERNEL_NPEM_H_INCLUDED_ | ||
|
|
||
| /* Project headers */ | ||
| #include <led/libled.h> | ||
|
|
||
| /* Local headers */ | ||
| #include "block.h" | ||
| #include "cntrl.h" | ||
| #include "slot.h" | ||
| #include "status.h" | ||
|
|
||
|
|
||
| int is_kernel_npem_present(const char *path); | ||
| status_t kernel_npem_write(struct block_device *device, enum led_ibpi_pattern ibpi); | ||
| char *kernel_npem_get_path(const char *cntrl_path); | ||
|
|
||
| /** | ||
| * @brief Gets slot information. | ||
| * | ||
| * This function fills slot information related to the slot. | ||
| * | ||
| * @param[in] slot Pointer to the slot property element. | ||
| * | ||
| * @return STATUS_SUCCESS if successful, otherwise a valid status_t status code. | ||
| */ | ||
| enum led_ibpi_pattern kernel_npem_get_state(struct slot_property *slot); | ||
|
|
||
| /** | ||
| * @brief Sets led state for slot. | ||
| * | ||
| * This function sets given led state for slot. | ||
| * | ||
| * @param[in] slot Requested slot. | ||
| * @param[in] state IBPI state based on slot request. | ||
| * | ||
| * @return STATUS_SUCCESS if successful, otherwise a valid status_t status code. | ||
| */ | ||
| status_t kernel_npem_set_state(struct slot_property *slot, enum led_ibpi_pattern state); | ||
|
|
||
| /** | ||
| * @brief Initializes a slot_property for a specified NPEM controller. | ||
| * | ||
| * @param[in] npem_cntrl Specified npem controller for this slot | ||
stuarthayes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @return struct slot_property* if successful, else NULL on allocation failure | ||
| */ | ||
| struct slot_property *kernel_npem_slot_property_init(struct cntrl_device *npem_cntrl); | ||
|
|
||
| #endif // _KERNEL_NPEM_H_INCLUDED_ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -230,7 +230,8 @@ led_status_t led_slot_set(struct led_ctx *ctx, struct led_slot_list_entry *se, | |
| bool led_controller_slot_support(enum led_cntrl_type cntrl) | ||
| { | ||
| return (cntrl == LED_CNTRL_TYPE_NPEM || cntrl == LED_CNTRL_TYPE_SCSI || | ||
| cntrl == LED_CNTRL_TYPE_VMD); | ||
| cntrl == LED_CNTRL_TYPE_VMD) || | ||
| cntrl == LED_CNTRL_TYPE_KERNEL_NPEM; | ||
| } | ||
|
|
||
| struct led_slot_list_entry *led_slot_next(struct led_slot_list *sl) | ||
|
|
@@ -311,6 +312,7 @@ static const char * const ctrl_type_str[] = { | |
| [LED_CNTRL_TYPE_AHCI] = "AHCI", | ||
| [LED_CNTRL_TYPE_NPEM] = "NPEM", | ||
| [LED_CNTRL_TYPE_AMD] = "AMD", | ||
| [LED_CNTRL_TYPE_KERNEL_NPEM] = "Kernel NPEM", | ||
stuarthayes marked this conversation as resolved.
Show resolved
Hide resolved
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh one last thing. On Linux systems spaces are avoided, so please check it to |
||
| }; | ||
|
|
||
| enum led_cntrl_type led_string_to_cntrl_type(const char *cntrl_str) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.