Commit 39efc03e authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/powernv/sriov: Move M64 BAR allocation into a helper 



I want to refactor the loop this code is currently inside of. Hoist it on
out.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200722065715.1432738-13-oohall@gmail.com
parent 052da31d

arch/powerpc/platforms/powernv/pci-sriov.c

+20 −11
Original line number Diff line number Diff line
@@ -412,6 +412,23 @@ out: 
	return rc;

}



static int pnv_pci_alloc_m64_bar(struct pnv_phb *phb, struct pnv_iov_data *iov)

{

	int win;



	do {

		win = find_next_zero_bit(&phb->ioda.m64_bar_alloc,

				phb->ioda.m64_bar_idx + 1, 0);



		if (win >= phb->ioda.m64_bar_idx + 1)

			return -1;

	} while (test_and_set_bit(win, &phb->ioda.m64_bar_alloc));



	set_bit(win, iov->used_m64_bar_mask);



	return win;

}



static int pnv_pci_vf_assign_m64(struct pci_dev *pdev, u16 num_vfs)

{

	struct pnv_iov_data   *iov;
@@ -439,17 +456,9 @@ static int pnv_pci_vf_assign_m64(struct pci_dev *pdev, u16 num_vfs) 
			continue;



		for (j = 0; j < m64_bars; j++) {



			/* allocate a window ID for this BAR */

			do {

				win = find_next_zero_bit(&phb->ioda.m64_bar_alloc,

						phb->ioda.m64_bar_idx + 1, 0);



				if (win >= phb->ioda.m64_bar_idx + 1)

			win = pnv_pci_alloc_m64_bar(phb, iov);

			if (win < 0)

				goto m64_failed;

			} while (test_and_set_bit(win, &phb->ioda.m64_bar_alloc));

			set_bit(win, iov->used_m64_bar_mask);





			if (iov->m64_single_mode) {

				int pe_num = iov->vf_pe_arr[j].pe_number;

CRA Git | Maintained and supported by SUSTech CRA and CCSE