diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-05 10:40:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-05 10:40:16 -0700 |
| commit | 7c50f221837e9672e67f0a6be40ee02974cd7851 (patch) | |
| tree | 1592d25ea79bab4b47a518f0420e2fbd293f1321 | |
| parent | 3a28c9e12828adcc899a9738783f1380f077a260 (diff) | |
| parent | ee1e3c46ed19c096be22472c728fa7f68b1352c4 (diff) | |
| download | lwn-7c50f221837e9672e67f0a6be40ee02974cd7851.tar.gz lwn-7c50f221837e9672e67f0a6be40ee02974cd7851.zip | |
Merge tag 'cxl-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl
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
| -rw-r--r-- | drivers/acpi/apei/einj-cxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/einj-cxl.c b/drivers/acpi/apei/einj-cxl.c index 4f81a119ec08..a4e709937236 100644 --- 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; } |