Commit 4e4dc65a authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

s390/pci: use phys_to_virt() for AIBVs/DIBVs 



The adapter and directed interrupt bit vectors need to be referenced in
the FIB with their physical not their virtual address. So use
virt_to_phys() as approrpiate.

Note: this currently doesn't fix a real bug, since virtual addresses
are indentical to physical ones.

Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 97aa7468

arch/s390/pci/pci_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ static int zpci_set_airq(struct zpci_dev *zdev) 
	fib.fmt0.isc = PCI_ISC;

	fib.fmt0.sum = 1;	/* enable summary notifications */

	fib.fmt0.noi = airq_iv_end(zdev->aibv);

	fib.fmt0.aibv = (unsigned long) zdev->aibv->vector;

	fib.fmt0.aibv = virt_to_phys(zdev->aibv->vector);

	fib.fmt0.aibvo = 0;	/* each zdev has its own interrupt vector */

	fib.fmt0.aisb = (unsigned long) zpci_sbv->vector + (zdev->aisb/64)*8;

	fib.fmt0.aisb = virt_to_phys(zpci_sbv->vector) + (zdev->aisb / 64) * 8;

	fib.fmt0.aisbo = zdev->aisb & 63;



	return zpci_mod_fc(req, &fib, &status) ? -EIO : 0;
@@ -422,7 +422,7 @@ static int __init zpci_directed_irq_init(void) 


	iib.diib.isc = PCI_ISC;

	iib.diib.nr_cpus = num_possible_cpus();

	iib.diib.disb_addr = (u64) zpci_sbv->vector;

	iib.diib.disb_addr = virt_to_phys(zpci_sbv->vector);

	__zpci_set_irq_ctrl(SIC_IRQ_MODE_DIRECT, 0, &iib);



	zpci_ibv = kcalloc(num_possible_cpus(), sizeof(*zpci_ibv),