Skip to content

Commit b997bf2

Browse files
bjking1mpe
authored andcommitted
powerpc: Enable support for 32 bit MSI-X vectors
Some devices are not capable of addressing 64 bits via DMA, which includes MSI-X vectors. This allows us to ensure these devices use MSI-X vectors in 32 bit space. Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240117214632.134539-1-brking@linux.vnet.ibm.com
1 parent 9cbacb8 commit b997bf2

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

  • arch/powerpc/platforms/pseries

arch/powerpc/platforms/pseries/msi.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ static int query_token, change_token;
2626
#define RTAS_CHANGE_MSI_FN 3
2727
#define RTAS_CHANGE_MSIX_FN 4
2828
#define RTAS_CHANGE_32MSI_FN 5
29+
#define RTAS_CHANGE_32MSIX_FN 6
2930

3031
/* RTAS Helpers */
3132

@@ -41,7 +42,7 @@ static int rtas_change_msi(struct pci_dn *pdn, u32 func, u32 num_irqs)
4142
seq_num = 1;
4243
do {
4344
if (func == RTAS_CHANGE_MSI_FN || func == RTAS_CHANGE_MSIX_FN ||
44-
func == RTAS_CHANGE_32MSI_FN)
45+
func == RTAS_CHANGE_32MSI_FN || func == RTAS_CHANGE_32MSIX_FN)
4546
rc = rtas_call(change_token, 6, 4, rtas_ret, addr,
4647
BUID_HI(buid), BUID_LO(buid),
4748
func, num_irqs, seq_num);
@@ -406,8 +407,12 @@ static int rtas_prepare_msi_irqs(struct pci_dev *pdev, int nvec_in, int type,
406407

407408
if (use_32bit_msi_hack && rc > 0)
408409
rtas_hack_32bit_msi_gen2(pdev);
409-
} else
410-
rc = rtas_change_msi(pdn, RTAS_CHANGE_MSIX_FN, nvec);
410+
} else {
411+
if (pdev->no_64bit_msi)
412+
rc = rtas_change_msi(pdn, RTAS_CHANGE_32MSIX_FN, nvec);
413+
else
414+
rc = rtas_change_msi(pdn, RTAS_CHANGE_MSIX_FN, nvec);
415+
}
411416

412417
if (rc != nvec) {
413418
if (nvec != nvec_in) {

0 commit comments

Comments
 (0)