Merge tag 'cxl-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

torvalds · torvalds · commit 7c50f221837e · 2024-10-05T10:40:16.000-07:00
Pull cxl fix from Ira Weiny:

 - Fix calculation for SBDF in error injection

* tag 'cxl-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl:
  EINJ, CXL: Fix CXL device SBDF calculation
diff --git a/drivers/acpi/apei/einj-cxl.c b/drivers/acpi/apei/einj-cxl.c
@@ -63,7 +63,7 @@ static int cxl_dport_get_sbdf(struct pci_dev *dport_dev, u64 *sbdf)
 		seg = bridge->domain_nr;
 
 	bus = pbus->number;
-	*sbdf = (seg << 24) | (bus << 16) | dport_dev->devfn;
+	*sbdf = (seg << 24) | (bus << 16) | (dport_dev->devfn << 8);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static int cxl_dport_get_sbdf(struct pci_dev dport_dev, u64 sbdf)`
`63`	`63`	`seg = bridge->domain_nr;`
`64`	`64`
`65`	`65`	`bus = pbus->number;`
`66`		`- *sbdf = (seg << 24) \| (bus << 16) \| dport_dev->devfn;`
	`66`	`+ *sbdf = (seg << 24) \| (bus << 16) \| (dport_dev->devfn << 8);`
`67`	`67`
`68`	`68`	`return 0;`
`69`	`69`	`}`