github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

perf/cxl: Split the MSI vector out of info->irq

Browse Source 
info->irq means two different things depending on how far probe has got.
cxl_pmu_parse_caps() sets it to the MSI/MSI-X message number from the CPMU
Capability register. cxl_pmu_probe() passes that to pci_irq_vector() and
then overwrites it with the Linux virq, which is what the hotplug callbacks
hand to irq_set_affinity().

Both are ints called irq, so nothing catches a mix-up, and the valid ranges
differ. 0 is a fine message number but never a valid virq.

Give the message number its own field. No functional change.

Assisted-by: Claude:claude-opus-4-8
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Dave Jiang 2026-08-05 08:59:05 -07:00 committed by Will Deacon
parent af06fba457
commit 97fe5d94b7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/perf/cxl_pmu.c
View File

@ -111,6 +111,7 @@ struct cxl_pmu_info {
struct hlist_node node;
bool filter_hdm;
bool filter_crb;
int msi_vec;
int irq;
};
@ -150,9 +151,9 @@ static int cxl_pmu_parse_caps(struct device *dev, struct cxl_pmu_info *info)
info->filter_crb = FIELD_GET(CXL_PMU_CAP_FILTERS_SUP_MSK, val) &
CXL_PMU_FILTER_CHAN_RANK_BANK;
if (FIELD_GET(CXL_PMU_CAP_INT, val))
info->irq = FIELD_GET(CXL_PMU_CAP_MSI_N_MSK, val);
info->msi_vec = FIELD_GET(CXL_PMU_CAP_MSI_N_MSK, val);
else
info->irq = -1;
info->msi_vec = -1;
/* First handle fixed function counters; note if configurable counters found */
for (i = 0; i < info->num_counters; i++) {
@ -986,10 +987,10 @@ static int cxl_pmu_probe(struct device *dev)
.capabilities = PERF_PMU_CAP_NO_EXCLUDE,
};
if (info->irq < 0)
if (info->msi_vec < 0)
return -EINVAL;
rc = pci_irq_vector(pdev, info->irq);
rc = pci_irq_vector(pdev, info->msi_vec);
if (rc < 0)
return rc;
irq = rc;