| Message ID | 1312856226-3695-1-git-send-email-b34182@freescale.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Kumar Gala |
| Headers | show |
Hi, Andrew, Could you please apply this patch into your tree? Thanks a lot! Regards, Liu Gang -----Original Message----- From: Bounine, Alexandre [mailto:Alexandre.Bounine@idt.com] Sent: Tuesday, August 09, 2011 8:36 PM To: Liu Gang-B34182; linux-kernel@vger.kernel.org Cc: Li Yang-R58472; Zang Roy-R61911; linuxppc-dev@ozlabs.org; Liu Gang-B34182; akpm@linux-foundation.org; Gala Kumar-B11780 Subject: RE: [PATCH] rio: Use discovered bit to test if enumeration is complete On Monday, August 08, 2011 at 10:17 PM, Liu Gang wrote: > Subject: [PATCH] rio: 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 system, some agent devices can > also be master devices. They can issue requests into the system. > > Signed-off-by: Liu Gang <Gang.Liu@freescale.com> > --- > drivers/rapidio/rio-scan.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index ee89358..2dac1f0 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c @@ -924,7 +924,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. */ @@ -934,7 +934,7 @@ static int rio_enum_complete(struct rio_mport *port) rio_local_read_config_32(port, port->phys_efptr + RIO_PORT_GEN_CTL_CSR, ®val); - return (regval & RIO_PORT_GEN_MASTER) ? 1 : 0; + return (regval & RIO_PORT_GEN_DISCOVERED) ? 1 : 0; } /**
The discovered bit in PGCCSR register indicates if the device has been discovered by system host. In Rapidio system, some agent devices can also be master devices. They can issue requests into the system. Signed-off-by: Liu Gang <Gang.Liu@freescale.com> --- drivers/rapidio/rio-scan.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)