Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 14:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'thermal-intel'

Browse Source 
Merge fixes for the int340x thermal driver handling of MSI IRQs:

 - Fix MSI error path cleanup in int340x, allow it to work with a
   subset of thermal MSI IRQs if some of them are not working and
   make it free all MSI IRQs on module exit (Srinivas Pandruvada).

* thermal-intel:
  thermal: intel: int340x: Free MSI IRQ vectors on module exit
  thermal: intel: int340x: Allow limited thermal MSI support
  thermal: intel: int340x: Fix kernel warning during MSI cleanup
This commit is contained in:
Rafael J. Wysocki 2024-07-31 12:31:27 +02:00
commit d955d7cecb
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
View File

@ -278,20 +278,32 @@ static struct thermal_zone_params tzone_params = {
static bool msi_irq; static bool msi_irq;
static void proc_thermal_free_msi(struct pci_dev *pdev, struct proc_thermal_pci *pci_info)
{
int i;
for (i = 0; i < MSI_THERMAL_MAX; i++) {
if (proc_thermal_msi_map[i])
devm_free_irq(&pdev->dev, proc_thermal_msi_map[i], pci_info);
}
pci_free_irq_vectors(pdev);
}
static int proc_thermal_setup_msi(struct pci_dev *pdev, struct proc_thermal_pci *pci_info) static int proc_thermal_setup_msi(struct pci_dev *pdev, struct proc_thermal_pci *pci_info)
{ {
int ret, i, irq; int ret, i, irq, count;
ret = pci_alloc_irq_vectors(pdev, 1, MSI_THERMAL_MAX, PCI_IRQ_MSI | PCI_IRQ_MSIX); count = pci_alloc_irq_vectors(pdev, 1, MSI_THERMAL_MAX, PCI_IRQ_MSI | PCI_IRQ_MSIX);
if (ret < 0) { if (count < 0) {
dev_err(&pdev->dev, "Failed to allocate vectors!\n"); dev_err(&pdev->dev, "Failed to allocate vectors!\n");
return ret; return count;
} }
dev_info(&pdev->dev, "msi enabled:%d msix enabled:%d\n", pdev->msi_enabled, dev_info(&pdev->dev, "msi enabled:%d msix enabled:%d\n", pdev->msi_enabled,
pdev->msix_enabled); pdev->msix_enabled);
for (i = 0; i < MSI_THERMAL_MAX; i++) { for (i = 0; i < count; i++) {
irq = pci_irq_vector(pdev, i); irq = pci_irq_vector(pdev, i);
ret = devm_request_threaded_irq(&pdev->dev, irq, proc_thermal_irq_handler, ret = devm_request_threaded_irq(&pdev->dev, irq, proc_thermal_irq_handler,
@ -310,7 +322,7 @@ static int proc_thermal_setup_msi(struct pci_dev *pdev, struct proc_thermal_pci
return 0; return 0;
err_free_msi_vectors: err_free_msi_vectors:
pci_free_irq_vectors(pdev); proc_thermal_free_msi(pdev, pci_info);
return ret; return ret;
} }
@ -397,7 +409,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_
err_free_vectors: err_free_vectors:
if (msi_irq) if (msi_irq)
pci_free_irq_vectors(pdev); proc_thermal_free_msi(pdev, pci_info);
err_ret_tzone: err_ret_tzone:
thermal_zone_device_unregister(pci_info->tzone); thermal_zone_device_unregister(pci_info->tzone);
err_del_legacy: err_del_legacy:
@ -419,6 +431,9 @@ static void proc_thermal_pci_remove(struct pci_dev *pdev)
proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, 0); proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, 0);
proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0); proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0);
if (msi_irq)
proc_thermal_free_msi(pdev, pci_info);
thermal_zone_device_unregister(pci_info->tzone); thermal_zone_device_unregister(pci_info->tzone);
proc_thermal_mmio_remove(pdev, pci_info->proc_priv); proc_thermal_mmio_remove(pdev, pci_info->proc_priv);
if (!pci_info->no_legacy) if (!pci_info->no_legacy)