Commit f32fcbed authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: hvc: convert to u8 and size_t 



Switch character types to u8 and sizes to size_t. To conform to
characters/sizes in the rest of the tty layer.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Amit Shah <amit@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: virtualization@lists.linux.dev
Cc: linux-riscv@lists.infradead.org
Link: https://lore.kernel.org/r/20231206073712.17776-13-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3fb7367

arch/powerpc/include/asm/hvconsole.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
 * Vio firmware always attempts to fetch MAX_VIO_GET_CHARS chars.  The 'count'

 * parm is included to conform to put_chars() function pointer template

 */

extern int hvc_get_chars(uint32_t vtermno, char *buf, int count);

extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count);

extern ssize_t hvc_get_chars(uint32_t vtermno, u8 *buf, size_t count);

extern ssize_t hvc_put_chars(uint32_t vtermno, const u8 *buf, size_t count);



/* Provided by HVC VIO */

void hvc_vio_init_early(void);

arch/powerpc/include/asm/hvsi.h

+10 −8
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct hvsi_priv { 
	unsigned int	inbuf_len;	/* data in input buffer */

	unsigned char	inbuf[HVSI_INBUF_SIZE];

	unsigned int	inbuf_cur;	/* Cursor in input buffer */

	unsigned int	inbuf_pktlen;	/* packet length from cursor */

	size_t		inbuf_pktlen;	/* packet length from cursor */

	atomic_t	seqno;		/* packet sequence number */

	unsigned int	opened:1;	/* driver opened */

	unsigned int	established:1;	/* protocol established */
@@ -72,24 +72,26 @@ struct hvsi_priv { 
	unsigned int	mctrl_update:1;	/* modem control updated */

	unsigned short	mctrl;		/* modem control */

	struct tty_struct *tty;		/* tty structure */

	int (*get_chars)(uint32_t termno, char *buf, int count);

	int (*put_chars)(uint32_t termno, const char *buf, int count);

	ssize_t (*get_chars)(uint32_t termno, u8 *buf, size_t count);

	ssize_t (*put_chars)(uint32_t termno, const u8 *buf, size_t count);

	uint32_t	termno;

};



/* hvsi lib functions */

struct hvc_struct;

extern void hvsilib_init(struct hvsi_priv *pv,

			 int (*get_chars)(uint32_t termno, char *buf, int count),

			 int (*put_chars)(uint32_t termno, const char *buf,

					  int count),

			 ssize_t (*get_chars)(uint32_t termno, u8 *buf,

					      size_t count),

			 ssize_t (*put_chars)(uint32_t termno, const u8 *buf,

					      size_t count),

			 int termno, int is_console);

extern int hvsilib_open(struct hvsi_priv *pv, struct hvc_struct *hp);

extern void hvsilib_close(struct hvsi_priv *pv, struct hvc_struct *hp);

extern int hvsilib_read_mctrl(struct hvsi_priv *pv);

extern int hvsilib_write_mctrl(struct hvsi_priv *pv, int dtr);

extern void hvsilib_establish(struct hvsi_priv *pv);

extern int hvsilib_get_chars(struct hvsi_priv *pv, char *buf, int count);

extern int hvsilib_put_chars(struct hvsi_priv *pv, const char *buf, int count);

extern ssize_t hvsilib_get_chars(struct hvsi_priv *pv, u8 *buf, size_t count);

extern ssize_t hvsilib_put_chars(struct hvsi_priv *pv, const u8 *buf,

				 size_t count);



#endif /* _HVSI_H */

arch/powerpc/include/asm/opal.h

+5 −3
Original line number Diff line number Diff line
@@ -313,9 +313,11 @@ extern int early_init_dt_scan_recoverable_ranges(unsigned long node, 
				 const char *uname, int depth, void *data);

void __init opal_configure_cores(void);



extern int opal_get_chars(uint32_t vtermno, char *buf, int count);

extern int opal_put_chars(uint32_t vtermno, const char *buf, int total_len);

extern int opal_put_chars_atomic(uint32_t vtermno, const char *buf, int total_len);

extern ssize_t opal_get_chars(uint32_t vtermno, u8 *buf, size_t count);

extern ssize_t opal_put_chars(uint32_t vtermno, const u8 *buf,

			      size_t total_len);

extern ssize_t opal_put_chars_atomic(uint32_t vtermno, const u8 *buf,

				     size_t total_len);

extern int opal_flush_chars(uint32_t vtermno, bool wait);

extern int opal_flush_console(uint32_t vtermno);

arch/powerpc/platforms/powernv/opal.c

+8 −6
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static int __init opal_message_init(struct device_node *opal_node) 
	return 0;

}



int opal_get_chars(uint32_t vtermno, char *buf, int count)

ssize_t opal_get_chars(uint32_t vtermno, u8 *buf, size_t count)

{

	s64 rc;

	__be64 evt, len;
@@ -441,10 +441,11 @@ int opal_get_chars(uint32_t vtermno, char *buf, int count) 
	return 0;

}



static int __opal_put_chars(uint32_t vtermno, const char *data, int total_len, bool atomic)

static ssize_t __opal_put_chars(uint32_t vtermno, const u8 *data,

				size_t total_len, bool atomic)

{

	unsigned long flags = 0 /* shut up gcc */;

	int written;

	ssize_t written;

	__be64 olen;

	s64 rc;
@@ -484,7 +485,7 @@ static int __opal_put_chars(uint32_t vtermno, const char *data, int total_len, b 
		if (atomic) {

			/* Should not happen */

			pr_warn("atomic console write returned partial "

				"len=%d written=%d\n", total_len, written);

				"len=%zu written=%zd\n", total_len, written);

		}

		if (!written)

			written = -EAGAIN;
@@ -497,7 +498,7 @@ static int __opal_put_chars(uint32_t vtermno, const char *data, int total_len, b 
	return written;

}



int opal_put_chars(uint32_t vtermno, const char *data, int total_len)

ssize_t opal_put_chars(uint32_t vtermno, const u8 *data, size_t total_len)

{

	return __opal_put_chars(vtermno, data, total_len, false);

}
@@ -508,7 +509,8 @@ int opal_put_chars(uint32_t vtermno, const char *data, int total_len) 
 * true at the moment because console space can race with OPAL's console

 * writes.

 */

int opal_put_chars_atomic(uint32_t vtermno, const char *data, int total_len)

ssize_t opal_put_chars_atomic(uint32_t vtermno, const u8 *data,

			      size_t total_len)

{

	return __opal_put_chars(vtermno, data, total_len, true);

}

arch/powerpc/platforms/pseries/hvconsole.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 *	firmware.

 * @count: not used?

 */

int hvc_get_chars(uint32_t vtermno, char *buf, int count)

ssize_t hvc_get_chars(uint32_t vtermno, u8 *buf, size_t count)

{

	long ret;

	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(hvc_get_chars); 
 *	firmware. Must be at least 16 bytes, even if count is less than 16.

 * @count: Send this number of characters.

 */

int hvc_put_chars(uint32_t vtermno, const char *buf, int count)

ssize_t hvc_put_chars(uint32_t vtermno, const u8 *buf, size_t count)

{

	unsigned long *lbuf = (unsigned long *) buf;

	long ret;