rapidio: modify for rev.3 specification changes (1ae842de) · Commits · 戴 / test

drivers/rapidio/devices/rio_mport_cdev.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1813,7 +1813,7 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv,
	if (rdev->pef & RIO_PEF_EXT_FEATURES) {		if (rdev->pef & RIO_PEF_EXT_FEATURES) {
	rdev->efptr = rval & 0xffff;		rdev->efptr = rval & 0xffff;
	rdev->phys_efptr = rio_mport_get_physefb(mport, 0, destid,		rdev->phys_efptr = rio_mport_get_physefb(mport, 0, destid,
	hopcount);		hopcount, &rdev->phys_rmap);

	rdev->em_efptr = rio_mport_get_feature(mport, 0, destid,		rdev->em_efptr = rio_mport_get_feature(mport, 0, destid,
	hopcount, RIO_EFB_ERR_MGMNT);		hopcount, RIO_EFB_ERR_MGMNT);

drivers/rapidio/devices/tsi721.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2555,11 +2555,11 @@ static int tsi721_query_mport(struct rio_mport *mport,
	struct tsi721_device *priv = mport->priv;		struct tsi721_device *priv = mport->priv;
	u32 rval;		u32 rval;

	rval = ioread32(priv->regs + (0x100 + RIO_PORT_N_ERR_STS_CSR(0)));		rval = ioread32(priv->regs + 0x100 + RIO_PORT_N_ERR_STS_CSR(0, 0));
	if (rval & RIO_PORT_N_ERR_STS_PORT_OK) {		if (rval & RIO_PORT_N_ERR_STS_PORT_OK) {
	rval = ioread32(priv->regs + (0x100 + RIO_PORT_N_CTL2_CSR(0)));		rval = ioread32(priv->regs + 0x100 + RIO_PORT_N_CTL2_CSR(0, 0));
	attr->link_speed = (rval & RIO_PORT_N_CTL2_SEL_BAUD) >> 28;		attr->link_speed = (rval & RIO_PORT_N_CTL2_SEL_BAUD) >> 28;
	rval = ioread32(priv->regs + (0x100 + RIO_PORT_N_CTL_CSR(0)));		rval = ioread32(priv->regs + 0x100 + RIO_PORT_N_CTL_CSR(0, 0));
	attr->link_width = (rval & RIO_PORT_N_CTL_IPW) >> 27;		attr->link_width = (rval & RIO_PORT_N_CTL_IPW) >> 27;
	} else		} else
	attr->link_speed = RIO_LINK_DOWN;		attr->link_speed = RIO_LINK_DOWN;
	@@ -2673,9 +2673,9 @@ static int tsi721_setup_mport(struct tsi721_device *priv)
	mport->ops = &tsi721_rio_ops;		mport->ops = &tsi721_rio_ops;
	mport->index = 0;		mport->index = 0;
	mport->sys_size = 0; /* small system */		mport->sys_size = 0; /* small system */
	mport->phy_type = RIO_PHY_SERIAL;
	mport->priv = (void *)priv;		mport->priv = (void *)priv;
	mport->phys_efptr = 0x100;		mport->phys_efptr = 0x100;
			mport->phys_rmap = 1;
	mport->dev.parent = &pdev->dev;		mport->dev.parent = &pdev->dev;
	mport->dev.release = tsi721_mport_release;		mport->dev.release = tsi721_mport_release;

drivers/rapidio/rio-scan.c

+18 −56

Original line number	Original line	Diff line number	Diff line
	@@ -49,15 +49,6 @@ struct rio_id_table {
	static int next_destid = 0;		static int next_destid = 0;
	static int next_comptag = 1;		static int next_comptag = 1;

	static int rio_mport_phys_table[] = {
	RIO_EFB_PAR_EP_ID,
	RIO_EFB_PAR_EP_REC_ID,
	RIO_EFB_SER_EP_ID,
	RIO_EFB_SER_EP_REC_ID,
	-1,
	};


	/**		/**
	* rio_destid_alloc - Allocate next available destID for given network		* rio_destid_alloc - Allocate next available destID for given network
	* @net: RIO network		* @net: RIO network
	@@ -380,10 +371,15 @@ static struct rio_dev rio_setup_device(struct rio_net net,
	if (rdev->pef & RIO_PEF_EXT_FEATURES) {		if (rdev->pef & RIO_PEF_EXT_FEATURES) {
	rdev->efptr = result & 0xffff;		rdev->efptr = result & 0xffff;
	rdev->phys_efptr = rio_mport_get_physefb(port, 0, destid,		rdev->phys_efptr = rio_mport_get_physefb(port, 0, destid,
	hopcount);		hopcount, &rdev->phys_rmap);
			pr_debug("RIO: %s Register Map %d device\n",
			__func__, rdev->phys_rmap);

	rdev->em_efptr = rio_mport_get_feature(port, 0, destid,		rdev->em_efptr = rio_mport_get_feature(port, 0, destid,
	hopcount, RIO_EFB_ERR_MGMNT);		hopcount, RIO_EFB_ERR_MGMNT);
			if (!rdev->em_efptr)
			rdev->em_efptr = rio_mport_get_feature(port, 0, destid,
			hopcount, RIO_EFB_ERR_MGMNT_HS);
	}		}

	rio_mport_read_config_32(port, destid, hopcount, RIO_SRC_OPS_CAR,		rio_mport_read_config_32(port, destid, hopcount, RIO_SRC_OPS_CAR,
	@@ -445,7 +441,7 @@ static struct rio_dev rio_setup_device(struct rio_net net,
	rio_route_clr_table(rdev, RIO_GLOBAL_TABLE, 0);		rio_route_clr_table(rdev, RIO_GLOBAL_TABLE, 0);
	} else {		} else {
	if (do_enum)		if (do_enum)
	/Enable Input Output Port (transmitter reviever)/		/Enable Input Output Port (transmitter receiver)/
	rio_enable_rx_tx_port(port, 0, destid, hopcount, 0);		rio_enable_rx_tx_port(port, 0, destid, hopcount, 0);

	dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,		dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
	@@ -481,10 +477,8 @@ cleanup:

	/**		/**
	* rio_sport_is_active- Tests if a switch port has an active connection.		* rio_sport_is_active- Tests if a switch port has an active connection.
	* @port: Master port to send transaction		* @rdev: RapidIO device object
	* @destid: Associated destination ID for switch		* @sp: Switch port number
	* @hopcount: Hopcount to reach switch
	* @sport: Switch port number
	*		*
	* Reads the port error status CSR for a particular switch port to		* Reads the port error status CSR for a particular switch port to
	* determine if the port has an active link. Returns		* determine if the port has an active link. Returns
	@@ -492,30 +486,11 @@ cleanup:
	* inactive.		* inactive.
	*/		*/
	static int		static int
	rio_sport_is_active(struct rio_mport *port, u16 destid, u8 hopcount, int sport)		rio_sport_is_active(struct rio_dev *rdev, int sp)
	{		{
	u32 result = 0;		u32 result = 0;
	u32 ext_ftr_ptr;

	ext_ftr_ptr = rio_mport_get_efb(port, 0, destid, hopcount, 0);

	while (ext_ftr_ptr) {
	rio_mport_read_config_32(port, destid, hopcount,
	ext_ftr_ptr, &result);
	result = RIO_GET_BLOCK_ID(result);
	if ((result == RIO_EFB_SER_EP_FREE_ID) \|\|
	(result == RIO_EFB_SER_EP_FREE_ID_V13P) \|\|
	(result == RIO_EFB_SER_EP_FREC_ID))
	break;

	ext_ftr_ptr = rio_mport_get_efb(port, 0, destid, hopcount,
	ext_ftr_ptr);
	}

	if (ext_ftr_ptr)		rio_read_config_32(rdev, RIO_DEV_PORT_N_ERR_STS_CSR(rdev, sp),
	rio_mport_read_config_32(port, destid, hopcount,
	ext_ftr_ptr +
	RIO_PORT_N_ERR_STS_CSR(sport),
	&result);		&result);

	return result & RIO_PORT_N_ERR_STS_PORT_OK;		return result & RIO_PORT_N_ERR_STS_PORT_OK;
	@@ -655,9 +630,7 @@ static int rio_enum_peer(struct rio_net net, struct rio_mport port,

	cur_destid = next_destid;		cur_destid = next_destid;

	if (rio_sport_is_active		if (rio_sport_is_active(rdev, port_num)) {
	(port, RIO_ANY_DESTID(port->sys_size), hopcount,
	port_num)) {
	pr_debug(		pr_debug(
	"RIO: scanning device on port %d\n",		"RIO: scanning device on port %d\n",
	port_num);		port_num);
	@@ -785,8 +758,7 @@ rio_disc_peer(struct rio_net net, struct rio_mport port, u16 destid,
	if (RIO_GET_PORT_NUM(rdev->swpinfo) == port_num)		if (RIO_GET_PORT_NUM(rdev->swpinfo) == port_num)
	continue;		continue;

	if (rio_sport_is_active		if (rio_sport_is_active(rdev, port_num)) {
	(port, destid, hopcount, port_num)) {
	pr_debug(		pr_debug(
	"RIO: scanning device on port %d\n",		"RIO: scanning device on port %d\n",
	port_num);		port_num);
	@@ -831,21 +803,11 @@ rio_disc_peer(struct rio_net net, struct rio_mport port, u16 destid,
	static int rio_mport_is_active(struct rio_mport *port)		static int rio_mport_is_active(struct rio_mport *port)
	{		{
	u32 result = 0;		u32 result = 0;
	u32 ext_ftr_ptr;
	int *entry = rio_mport_phys_table;

	do {
	if ((ext_ftr_ptr =
	rio_mport_get_feature(port, 1, 0, 0, *entry)))
	break;
	} while (*++entry >= 0);

	if (ext_ftr_ptr)
	rio_local_read_config_32(port,		rio_local_read_config_32(port,
	ext_ftr_ptr +		port->phys_efptr +
	RIO_PORT_N_ERR_STS_CSR(port->index),		RIO_PORT_N_ERR_STS_CSR(port->index, port->phys_rmap),
	&result);		&result);

	return result & RIO_PORT_N_ERR_STS_PORT_OK;		return result & RIO_PORT_N_ERR_STS_PORT_OK;
	}		}

drivers/rapidio/rio.c

+77 −73

Original line number	Original line	Diff line number	Diff line
	@@ -786,10 +786,11 @@ EXPORT_SYMBOL_GPL(rio_unmap_outb_region);
	* @local: Indicate a local master port or remote device access		* @local: Indicate a local master port or remote device access
	* @destid: Destination ID of the device		* @destid: Destination ID of the device
	* @hopcount: Number of switch hops to the device		* @hopcount: Number of switch hops to the device
			* @rmap: pointer to location to store register map type info
	*/		*/
	u32		u32
	rio_mport_get_physefb(struct rio_mport *port, int local,		rio_mport_get_physefb(struct rio_mport *port, int local,
	u16 destid, u8 hopcount)		u16 destid, u8 hopcount, u32 *rmap)
	{		{
	u32 ext_ftr_ptr;		u32 ext_ftr_ptr;
	u32 ftr_header;		u32 ftr_header;
	@@ -807,14 +808,21 @@ rio_mport_get_physefb(struct rio_mport *port, int local,
	ftr_header = RIO_GET_BLOCK_ID(ftr_header);		ftr_header = RIO_GET_BLOCK_ID(ftr_header);
	switch (ftr_header) {		switch (ftr_header) {

	case RIO_EFB_SER_EP_ID_V13P:
	case RIO_EFB_SER_EP_REC_ID_V13P:
	case RIO_EFB_SER_EP_FREE_ID_V13P:
	case RIO_EFB_SER_EP_ID:		case RIO_EFB_SER_EP_ID:
	case RIO_EFB_SER_EP_REC_ID:		case RIO_EFB_SER_EP_REC_ID:
	case RIO_EFB_SER_EP_FREE_ID:		case RIO_EFB_SER_EP_FREE_ID:
	case RIO_EFB_SER_EP_FREC_ID:		case RIO_EFB_SER_EP_M1_ID:
			case RIO_EFB_SER_EP_SW_M1_ID:
			case RIO_EFB_SER_EPF_M1_ID:
			case RIO_EFB_SER_EPF_SW_M1_ID:
			*rmap = 1;
			return ext_ftr_ptr;

			case RIO_EFB_SER_EP_M2_ID:
			case RIO_EFB_SER_EP_SW_M2_ID:
			case RIO_EFB_SER_EPF_M2_ID:
			case RIO_EFB_SER_EPF_SW_M2_ID:
			*rmap = 2;
	return ext_ftr_ptr;		return ext_ftr_ptr;

	default:		default:
	@@ -873,7 +881,7 @@ int rio_set_port_lockout(struct rio_dev *rdev, u32 pnum, int lock)
	u32 regval;		u32 regval;

	rio_read_config_32(rdev,		rio_read_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_CTL_CSR(pnum),		RIO_DEV_PORT_N_CTL_CSR(rdev, pnum),
	&regval);		&regval);
	if (lock)		if (lock)
	regval \|= RIO_PORT_N_CTL_LOCKOUT;		regval \|= RIO_PORT_N_CTL_LOCKOUT;
	@@ -881,7 +889,7 @@ int rio_set_port_lockout(struct rio_dev *rdev, u32 pnum, int lock)
	regval &= ~RIO_PORT_N_CTL_LOCKOUT;		regval &= ~RIO_PORT_N_CTL_LOCKOUT;

	rio_write_config_32(rdev,		rio_write_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_CTL_CSR(pnum),		RIO_DEV_PORT_N_CTL_CSR(rdev, pnum),
	regval);		regval);
	return 0;		return 0;
	}		}
	@@ -906,6 +914,7 @@ int rio_enable_rx_tx_port(struct rio_mport *port,
	#ifdef CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS		#ifdef CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS
	u32 regval;		u32 regval;
	u32 ext_ftr_ptr;		u32 ext_ftr_ptr;
			u32 rmap;

	/*		/*
	* enable rx input tx output port		* enable rx input tx output port
	@@ -913,34 +922,29 @@ int rio_enable_rx_tx_port(struct rio_mport *port,
	pr_debug("rio_enable_rx_tx_port(local = %d, destid = %d, hopcount = "		pr_debug("rio_enable_rx_tx_port(local = %d, destid = %d, hopcount = "
	"%d, port_num = %d)\n", local, destid, hopcount, port_num);		"%d, port_num = %d)\n", local, destid, hopcount, port_num);

	ext_ftr_ptr = rio_mport_get_physefb(port, local, destid, hopcount);		ext_ftr_ptr = rio_mport_get_physefb(port, local, destid,
			hopcount, &rmap);

	if (local) {		if (local) {
	rio_local_read_config_32(port, ext_ftr_ptr +		rio_local_read_config_32(port,
	RIO_PORT_N_CTL_CSR(0),		ext_ftr_ptr + RIO_PORT_N_CTL_CSR(0, rmap),
	&regval);		&regval);
	} else {		} else {
	if (rio_mport_read_config_32(port, destid, hopcount,		if (rio_mport_read_config_32(port, destid, hopcount,
	ext_ftr_ptr + RIO_PORT_N_CTL_CSR(port_num), &regval) < 0)		ext_ftr_ptr + RIO_PORT_N_CTL_CSR(port_num, rmap),
			&regval) < 0)
	return -EIO;		return -EIO;
	}		}

	if (regval & RIO_PORT_N_CTL_P_TYP_SER) {		regval = regval \| RIO_PORT_N_CTL_EN_RX \| RIO_PORT_N_CTL_EN_TX;
	/* serial */
	regval = regval \| RIO_PORT_N_CTL_EN_RX_SER
	\| RIO_PORT_N_CTL_EN_TX_SER;
	} else {
	/* parallel */
	regval = regval \| RIO_PORT_N_CTL_EN_RX_PAR
	\| RIO_PORT_N_CTL_EN_TX_PAR;
	}

	if (local) {		if (local) {
	rio_local_write_config_32(port, ext_ftr_ptr +		rio_local_write_config_32(port,
	RIO_PORT_N_CTL_CSR(0), regval);		ext_ftr_ptr + RIO_PORT_N_CTL_CSR(0, rmap), regval);
	} else {		} else {
	if (rio_mport_write_config_32(port, destid, hopcount,		if (rio_mport_write_config_32(port, destid, hopcount,
	ext_ftr_ptr + RIO_PORT_N_CTL_CSR(port_num), regval) < 0)		ext_ftr_ptr + RIO_PORT_N_CTL_CSR(port_num, rmap),
			regval) < 0)
	return -EIO;		return -EIO;
	}		}
	#endif		#endif
	@@ -1042,14 +1046,14 @@ rio_get_input_status(struct rio_dev rdev, int pnum, u32 lnkresp)
	/* Read from link maintenance response register		/* Read from link maintenance response register
	* to clear valid bit */		* to clear valid bit */
	rio_read_config_32(rdev,		rio_read_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(pnum),		RIO_DEV_PORT_N_MNT_RSP_CSR(rdev, pnum),
	&regval);		&regval);
	udelay(50);		udelay(50);
	}		}

	/* Issue Input-status command */		/* Issue Input-status command */
	rio_write_config_32(rdev,		rio_write_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_MNT_REQ_CSR(pnum),		RIO_DEV_PORT_N_MNT_REQ_CSR(rdev, pnum),
	RIO_MNT_REQ_CMD_IS);		RIO_MNT_REQ_CMD_IS);

	/* Exit if the response is not expected */		/* Exit if the response is not expected */
	@@ -1060,7 +1064,7 @@ rio_get_input_status(struct rio_dev rdev, int pnum, u32 lnkresp)
	while (checkcount--) {		while (checkcount--) {
	udelay(50);		udelay(50);
	rio_read_config_32(rdev,		rio_read_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(pnum),		RIO_DEV_PORT_N_MNT_RSP_CSR(rdev, pnum),
	&regval);		&regval);
	if (regval & RIO_PORT_N_MNT_RSP_RVAL) {		if (regval & RIO_PORT_N_MNT_RSP_RVAL) {
	*lnkresp = regval;		*lnkresp = regval;
	@@ -1076,6 +1080,13 @@ rio_get_input_status(struct rio_dev rdev, int pnum, u32 lnkresp)
	* @rdev: Pointer to RIO device control structure		* @rdev: Pointer to RIO device control structure
	* @pnum: Switch port number to clear errors		* @pnum: Switch port number to clear errors
	* @err_status: port error status (if 0 reads register from device)		* @err_status: port error status (if 0 reads register from device)
			*
			* TODO: Currently this routine is not compatible with recovery process
			* specified for idt_gen3 RapidIO switch devices. It has to be reviewed
			* to implement universal recovery process that is compatible full range
			* off available devices.
			* IDT gen3 switch driver now implements HW-specific error handler that
			* issues soft port reset to the port to reset ERR_STOP bits and ackIDs.
	*/		*/
	static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)		static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
	{		{
	@@ -1085,10 +1096,10 @@ static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)

	if (err_status == 0)		if (err_status == 0)
	rio_read_config_32(rdev,		rio_read_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(pnum),		RIO_DEV_PORT_N_ERR_STS_CSR(rdev, pnum),
	&err_status);		&err_status);

	if (err_status & RIO_PORT_N_ERR_STS_PW_OUT_ES) {		if (err_status & RIO_PORT_N_ERR_STS_OUT_ES) {
	pr_debug("RIO_EM: servicing Output Error-Stopped state\n");		pr_debug("RIO_EM: servicing Output Error-Stopped state\n");
	/*		/*
	* Send a Link-Request/Input-Status control symbol		* Send a Link-Request/Input-Status control symbol
	@@ -1103,7 +1114,7 @@ static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
	far_ackid = (regval & RIO_PORT_N_MNT_RSP_ASTAT) >> 5;		far_ackid = (regval & RIO_PORT_N_MNT_RSP_ASTAT) >> 5;
	far_linkstat = regval & RIO_PORT_N_MNT_RSP_LSTAT;		far_linkstat = regval & RIO_PORT_N_MNT_RSP_LSTAT;
	rio_read_config_32(rdev,		rio_read_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_ACK_STS_CSR(pnum),		RIO_DEV_PORT_N_ACK_STS_CSR(rdev, pnum),
	&regval);		&regval);
	pr_debug("RIO_EM: SP%d_ACK_STS_CSR=0x%08x\n", pnum, regval);		pr_debug("RIO_EM: SP%d_ACK_STS_CSR=0x%08x\n", pnum, regval);
	near_ackid = (regval & RIO_PORT_N_ACK_INBOUND) >> 24;		near_ackid = (regval & RIO_PORT_N_ACK_INBOUND) >> 24;
	@@ -1121,43 +1132,43 @@ static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
	* far inbound.		* far inbound.
	*/		*/
	rio_write_config_32(rdev,		rio_write_config_32(rdev,
	rdev->phys_efptr + RIO_PORT_N_ACK_STS_CSR(pnum),		RIO_DEV_PORT_N_ACK_STS_CSR(rdev, pnum),
	(near_ackid << 24) \|		(near_ackid << 24) \|
	(far_ackid << 8) \| far_ackid);		(far_ackid << 8) \| far_ackid);
	/* Align far outstanding/outbound ackIDs with		/* Align far outstanding/outbound ackIDs with
	* near inbound.		* near inbound.
	*/		*/
	far_ackid++;		far_ackid++;
	if (nextdev)		if (!nextdev) {
			pr_debug("RIO_EM: nextdev pointer == NULL\n");
			goto rd_err;
			}

	rio_write_config_32(nextdev,		rio_write_config_32(nextdev,
	nextdev->phys_efptr +		RIO_DEV_PORT_N_ACK_STS_CSR(nextdev,
	RIO_PORT_N_ACK_STS_CSR(RIO_GET_PORT_NUM(nextdev->swpinfo)),		RIO_GET_PORT_NUM(nextdev->swpinfo)),
	(far_ackid << 24) \|		(far_ackid << 24) \|
	(near_ackid << 8) \| near_ackid);		(near_ackid << 8) \| near_ackid);
	else
	pr_debug("RIO_EM: Invalid nextdev pointer (NULL)\n");
	}		}
	rd_err:		rd_err:
	rio_read_config_32(rdev,		rio_read_config_32(rdev, RIO_DEV_PORT_N_ERR_STS_CSR(rdev, pnum),
	rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(pnum),
	&err_status);		&err_status);
	pr_debug("RIO_EM: SP%d_ERR_STS_CSR=0x%08x\n", pnum, err_status);		pr_debug("RIO_EM: SP%d_ERR_STS_CSR=0x%08x\n", pnum, err_status);
	}		}

	if ((err_status & RIO_PORT_N_ERR_STS_PW_INP_ES) && nextdev) {		if ((err_status & RIO_PORT_N_ERR_STS_INP_ES) && nextdev) {
	pr_debug("RIO_EM: servicing Input Error-Stopped state\n");		pr_debug("RIO_EM: servicing Input Error-Stopped state\n");
	rio_get_input_status(nextdev,		rio_get_input_status(nextdev,
	RIO_GET_PORT_NUM(nextdev->swpinfo), NULL);		RIO_GET_PORT_NUM(nextdev->swpinfo), NULL);
	udelay(50);		udelay(50);

	rio_read_config_32(rdev,		rio_read_config_32(rdev, RIO_DEV_PORT_N_ERR_STS_CSR(rdev, pnum),
	rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(pnum),
	&err_status);		&err_status);
	pr_debug("RIO_EM: SP%d_ERR_STS_CSR=0x%08x\n", pnum, err_status);		pr_debug("RIO_EM: SP%d_ERR_STS_CSR=0x%08x\n", pnum, err_status);
	}		}

	return (err_status & (RIO_PORT_N_ERR_STS_PW_OUT_ES \|		return (err_status & (RIO_PORT_N_ERR_STS_OUT_ES \|
	RIO_PORT_N_ERR_STS_PW_INP_ES)) ? 1 : 0;		RIO_PORT_N_ERR_STS_INP_ES)) ? 1 : 0;
	}		}

	/**		/**
	@@ -1257,8 +1268,7 @@ int rio_inb_pwrite_handler(struct rio_mport mport, union rio_pw_msg pw_msg)
	if (rdev->rswitch->ops && rdev->rswitch->ops->em_handle)		if (rdev->rswitch->ops && rdev->rswitch->ops->em_handle)
	rdev->rswitch->ops->em_handle(rdev, portnum);		rdev->rswitch->ops->em_handle(rdev, portnum);

	rio_read_config_32(rdev,		rio_read_config_32(rdev, RIO_DEV_PORT_N_ERR_STS_CSR(rdev, portnum),
	rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
	&err_status);		&err_status);
	pr_debug("RIO_PW: SP%d_ERR_STS_CSR=0x%08x\n", portnum, err_status);		pr_debug("RIO_PW: SP%d_ERR_STS_CSR=0x%08x\n", portnum, err_status);

	@@ -1276,8 +1286,8 @@ int rio_inb_pwrite_handler(struct rio_mport mport, union rio_pw_msg pw_msg)
	* Depending on the link partner state, two attempts		* Depending on the link partner state, two attempts
	* may be needed for successful recovery.		* may be needed for successful recovery.
	*/		*/
	if (err_status & (RIO_PORT_N_ERR_STS_PW_OUT_ES \|		if (err_status & (RIO_PORT_N_ERR_STS_OUT_ES \|
	RIO_PORT_N_ERR_STS_PW_INP_ES)) {		RIO_PORT_N_ERR_STS_INP_ES)) {
	if (rio_clr_err_stopped(rdev, portnum, err_status))		if (rio_clr_err_stopped(rdev, portnum, err_status))
	rio_clr_err_stopped(rdev, portnum, 0);		rio_clr_err_stopped(rdev, portnum, 0);
	}		}
	@@ -1287,10 +1297,18 @@ int rio_inb_pwrite_handler(struct rio_mport mport, union rio_pw_msg pw_msg)
	rdev->rswitch->port_ok &= ~(1 << portnum);		rdev->rswitch->port_ok &= ~(1 << portnum);
	rio_set_port_lockout(rdev, portnum, 1);		rio_set_port_lockout(rdev, portnum, 1);

			if (rdev->phys_rmap == 1) {
	rio_write_config_32(rdev,		rio_write_config_32(rdev,
	rdev->phys_efptr +		RIO_DEV_PORT_N_ACK_STS_CSR(rdev, portnum),
	RIO_PORT_N_ACK_STS_CSR(portnum),
	RIO_PORT_N_ACK_CLEAR);		RIO_PORT_N_ACK_CLEAR);
			} else {
			rio_write_config_32(rdev,
			RIO_DEV_PORT_N_OB_ACK_CSR(rdev, portnum),
			RIO_PORT_N_OB_ACK_CLEAR);
			rio_write_config_32(rdev,
			RIO_DEV_PORT_N_IB_ACK_CSR(rdev, portnum),
			0);
			}

	/* Schedule Extraction Service */		/* Schedule Extraction Service */
	pr_debug("RIO_PW: Device Extraction on [%s]-P%d\n",		pr_debug("RIO_PW: Device Extraction on [%s]-P%d\n",
	@@ -1319,8 +1337,7 @@ int rio_inb_pwrite_handler(struct rio_mport mport, union rio_pw_msg pw_msg)
	}		}

	/* Clear remaining error bits and Port-Write Pending bit */		/* Clear remaining error bits and Port-Write Pending bit */
	rio_write_config_32(rdev,		rio_write_config_32(rdev, RIO_DEV_PORT_N_ERR_STS_CSR(rdev, portnum),
	rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
	err_status);		err_status);

	return 0;		return 0;
	@@ -1372,20 +1389,7 @@ EXPORT_SYMBOL_GPL(rio_mport_get_efb);
	* Tell if a device supports a given RapidIO capability.		* Tell if a device supports a given RapidIO capability.
	* Returns the offset of the requested extended feature		* Returns the offset of the requested extended feature
	* block within the device's RIO configuration space or		* block within the device's RIO configuration space or
	* 0 in case the device does not support it. Possible		* 0 in case the device does not support it.
	* values for @ftr:
	*
	* %RIO_EFB_PAR_EP_ID LP/LVDS EP Devices
	*
	* %RIO_EFB_PAR_EP_REC_ID LP/LVDS EP Recovery Devices
	*
	* %RIO_EFB_PAR_EP_FREE_ID LP/LVDS EP Free Devices
	*
	* %RIO_EFB_SER_EP_ID LP/Serial EP Devices
	*
	* %RIO_EFB_SER_EP_REC_ID LP/Serial EP Recovery Devices
	*
	* %RIO_EFB_SER_EP_FREE_ID LP/Serial EP Free Devices
	*/		*/
	u32		u32
	rio_mport_get_feature(struct rio_mport * port, int local, u16 destid,		rio_mport_get_feature(struct rio_mport * port, int local, u16 destid,

drivers/rapidio/rio.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	extern u32 rio_mport_get_feature(struct rio_mport *mport, int local, u16 destid,		extern u32 rio_mport_get_feature(struct rio_mport *mport, int local, u16 destid,
	u8 hopcount, int ftr);		u8 hopcount, int ftr);
	extern u32 rio_mport_get_physefb(struct rio_mport *port, int local,		extern u32 rio_mport_get_physefb(struct rio_mport *port, int local,
	u16 destid, u8 hopcount);		u16 destid, u8 hopcount, u32 *rmap);
	extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid,		extern u32 rio_mport_get_efb(struct rio_mport *port, int local, u16 destid,
	u8 hopcount, u32 from);		u8 hopcount, u32 from);
	extern int rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid,		extern int rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid,

Admin message