Skip to content

Commit a4574ec

Browse files
committed
Merge: PCI: pciehp: Retain Power Indicator bits for userspace indicators
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4837 ``` JIRA: https://issues.redhat.com/browse/RHEL-41181 Upstream Status: Currently in the 'for-linus' topic branch of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git slated for next "fixes" rc. This fixes an unintentional upstream regression introduced by commit abaaac4 ("PCI: hotplug: Use FIELD_GET/PREP()"). Signed-off-by: Myron Stowe <mstowe@redhat.com> ``` Approved-by: David Arcari <darcari@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
2 parents 5908ef5 + a6a6933 commit a4574ec

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/pci/hotplug/pciehp_hpc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,9 @@ int pciehp_set_raw_indicator_status(struct hotplug_slot *hotplug_slot,
485485
struct pci_dev *pdev = ctrl_dev(ctrl);
486486

487487
pci_config_pm_runtime_get(pdev);
488-
pcie_write_cmd_nowait(ctrl, FIELD_PREP(PCI_EXP_SLTCTL_AIC, status),
488+
489+
/* Attention and Power Indicator Control bits are supported */
490+
pcie_write_cmd_nowait(ctrl, FIELD_PREP(PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC, status),
489491
PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC);
490492
pci_config_pm_runtime_put(pdev);
491493
return 0;

0 commit comments

Comments
 (0)