Skip to content

Commit

Permalink
Merge tag 'cxl-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Oct 5, 2024
2 parents 3a28c9e + ee1e3c4 commit 7c50f22
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/acpi/apei/einj-cxl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 7c50f22

Please sign in to comment.