Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 321566c2 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller
Browse files

[SPARC64]: Fix 2 bugs in PCI Sabre bus scanning. 



If we are on hummingbird, bus runs at 66MHZ.

pbm->pci_bus should be setup with the result of pci_scan_one_pbm()
or else we deref NULL pointers in the error interrupt handlers.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7244d545

arch/sparc64/kernel/pci_sabre.c

+11 −6
Original line number Diff line number Diff line
@@ -636,12 +636,17 @@ static void apb_init(struct pci_bus *sabre_bus) 
static void sabre_scan_bus(struct pci_pbm_info *pbm)

{

	static int once;

	struct pci_bus *pbus;



	/* The APB bridge speaks to the Sabre host PCI bridge

	 * at 66Mhz, but the front side of APB runs at 33Mhz

	 * for both segments.

	 *

	 * Hummingbird systems do not use APB, so they run

	 * at 66MHZ.

	 */

	if (hummingbird_p)

		pbm->is_66mhz_capable = 1;

	else

		pbm->is_66mhz_capable = 0;



	/* This driver has not been verified to handle
@@ -656,13 +661,13 @@ static void sabre_scan_bus(struct pci_pbm_info *pbm) 
	}

	once++;



	pbus = pci_scan_one_pbm(pbm);

	if (!pbus)

	pbm->pci_bus = pci_scan_one_pbm(pbm);

	if (!pbm->pci_bus)

		return;



	sabre_root_bus = pbus;

	sabre_root_bus = pbm->pci_bus;



	apb_init(pbus);

	apb_init(pbm->pci_bus);



	sabre_register_error_handlers(pbm);

}