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

Commit 388c45cc authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: fix IDLE2 bits corruption 



RapidIO spec v.2.1 adds Idle Sequence 2 into LP-Serial Physical Layer.
The fix ensures that corresponding bits are not corrupted during error
handling.

Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Micha Nelissen <micha@neli.hopto.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af84ca38

drivers/rapidio/rio.c

+2 −7
Original line number Diff line number Diff line
@@ -871,15 +871,10 @@ int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg) 
			rdev->em_efptr + RIO_EM_LTL_ERR_DETECT, 0);

	}



	/* Clear remaining error bits */

	/* Clear remaining error bits and Port-Write Pending bit */

	rio_mport_write_config_32(mport, destid, hopcount,

			rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),

			err_status & RIO_PORT_N_ERR_STS_CLR_MASK);



	/* Clear Port-Write Pending bit */

	rio_mport_write_config_32(mport, destid, hopcount,

			rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),

			RIO_PORT_N_ERR_STS_PW_PEND);

			err_status);



	return 0;

}

include/linux/rio_regs.h

+1 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ 
#define  RIO_MNT_REQ_CMD_IS		0x04	/* Input-status command */

#define RIO_PORT_N_MNT_RSP_CSR(x)	(0x0044 + x*0x20)	/* 0x0002 */

#define  RIO_PORT_N_MNT_RSP_RVAL	0x80000000 /* Response Valid */

#define  RIO_PORT_N_MNT_RSP_ASTAT	0x000003e0 /* ackID Status */

#define  RIO_PORT_N_MNT_RSP_ASTAT	0x000007e0 /* ackID Status */

#define  RIO_PORT_N_MNT_RSP_LSTAT	0x0000001f /* Link Status */

#define RIO_PORT_N_ACK_STS_CSR(x)	(0x0048 + x*0x20)	/* 0x0002 */

#define  RIO_PORT_N_ACK_CLEAR		0x80000000
@@ -243,7 +243,6 @@ 
#define  RIO_PORT_N_ERR_STS_PORT_ERR	0x00000004

#define  RIO_PORT_N_ERR_STS_PORT_OK	0x00000002

#define  RIO_PORT_N_ERR_STS_PORT_UNINIT	0x00000001

#define  RIO_PORT_N_ERR_STS_CLR_MASK	0x07120204

#define RIO_PORT_N_CTL_CSR(x)		(0x005c + x*0x20)

#define  RIO_PORT_N_CTL_PWIDTH		0xc0000000

#define  RIO_PORT_N_CTL_PWIDTH_1	0x00000000