Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v6.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull PCI fixes from Bjorn Helgaas:
- Fix a pci_intx() regression that caused driver reload to fail with
"Resources present before probing" (Philipp Stanner)
- Fix a pciehp regression that clobbered the upper bits of RAID status
LEDs on NVMe devices behind an Intel VMD (Blazej Kucman)
* tag 'pci-v6.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
PCI: pciehp: Retain Power Indicator bits for userspace indicators
PCI: Fix devres regression in pci_intx()
+11
-8
+3
-1
drivers/pci/hotplug/pciehp_hpc.c
+3
-1
drivers/pci/hotplug/pciehp_hpc.c
···
485
485
struct pci_dev *pdev = ctrl_dev(ctrl);
486
486
487
487
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),
489
491
PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC);
490
492
pci_config_pm_runtime_put(pdev);
491
493
return 0;
+8
-7
drivers/pci/pci.c
+8
-7
drivers/pci/pci.c
···
4477
4477
{
4478
4478
u16 pci_command, new;
4479
4479
4480
-
/* Preserve the "hybrid" behavior for backwards compatibility */
4481
-
if (pci_is_managed(pdev)) {
4482
-
WARN_ON_ONCE(pcim_intx(pdev, enable) != 0);
4483
-
return;
4484
-
}
4485
-
4486
4480
pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
4487
4481
4488
4482
if (enable)
···
4484
4490
else
4485
4491
new = pci_command | PCI_COMMAND_INTX_DISABLE;
4486
4492
4487
-
if (new != pci_command)
4493
+
if (new != pci_command) {
4494
+
/* Preserve the "hybrid" behavior for backwards compatibility */
4495
+
if (pci_is_managed(pdev)) {
4496
+
WARN_ON_ONCE(pcim_intx(pdev, enable) != 0);
4497
+
return;
4498
+
}
4499
+
4488
4500
pci_write_config_word(pdev, PCI_COMMAND, new);
4501
+
}
4489
4502
}
4490
4503
EXPORT_SYMBOL_GPL(pci_intx);
4491
4504