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

Commit a571259f authored by Liu Gang's avatar Liu Gang Committed by Linus Torvalds
Browse files

drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete 



The discovered bit in PGCCSR register indicates if the device has been
discovered by system host.  In Rapidio systems, some agent devices can also
be master devices.  They can issue requests into the system.

Signed-off-by: default avatarLiu Gang <Gang.Liu@freescale.com>
Acked-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 79975f13

drivers/rapidio/rio-scan.c

+2 −2
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port, 
 * rio_enum_complete- Tests if enumeration of a network is complete

 * @port: Master port to send transaction

 *

 * Tests the Component Tag CSR for non-zero value (enumeration

 * Tests the PGCCSR discovered bit for non-zero value (enumeration

 * complete flag). Return %1 if enumeration is complete or %0 if

 * enumeration is incomplete.

 */
@@ -933,7 +933,7 @@ static int rio_enum_complete(struct rio_mport *port) 


	rio_local_read_config_32(port, port->phys_efptr + RIO_PORT_GEN_CTL_CSR,

				 &regval);

	return (regval & RIO_PORT_GEN_MASTER) ? 1 : 0;

	return (regval & RIO_PORT_GEN_DISCOVERED) ? 1 : 0;

}



/**