Commit b26d1ad1 authored by Douglas Anderson's avatar Douglas Anderson Committed by Greg Kroah-Hartman
Browse files

serial: qcom-geni: introduce qcom_geni_serial_poll_bitfield() 



With a small modification the qcom_geni_serial_poll_bit() function
could be used to poll more than just a single bit. Let's generalize
it. We'll make the qcom_geni_serial_poll_bit() into just a wrapper of
the general function.

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240610152420.v4.5.Ic6411eab8d9d37acc451705f583fb535cd6dadb2@changeid


Tested-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20240906131336.23625-6-johan+linaro@kernel.org


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

drivers/tty/serial/qcom_geni_serial.c

+9 −3
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ static bool qcom_geni_serial_secondary_active(struct uart_port *uport) 
	return readl(uport->membase + SE_GENI_STATUS) & S_GENI_CMD_ACTIVE;

}



static bool qcom_geni_serial_poll_bit(struct uart_port *uport,

				      unsigned int offset, u32 field, bool set)

static bool qcom_geni_serial_poll_bitfield(struct uart_port *uport,

					   unsigned int offset, u32 field, u32 val)

{

	u32 reg;

	struct qcom_geni_serial_port *port;
@@ -286,7 +286,7 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport, 
	timeout_us = DIV_ROUND_UP(timeout_us, 10) * 10;

	while (timeout_us) {

		reg = readl(uport->membase + offset);

		if ((bool)(reg & field) == set)

		if ((reg & field) == val)

			return true;

		udelay(10);

		timeout_us -= 10;
@@ -294,6 +294,12 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport, 
	return false;

}



static bool qcom_geni_serial_poll_bit(struct uart_port *uport,

				      unsigned int offset, u32 field, bool set)

{

	return qcom_geni_serial_poll_bitfield(uport, offset, field, set ? field : 0);

}



static void qcom_geni_serial_setup_tx(struct uart_port *uport, u32 xmit_size)

{

	u32 m_cmd;