Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp412456pxx; Wed, 28 Oct 2020 07:47:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7MMVNDLoA1ETPUZjQI6MVNqhivwtv1vTWez5NiK/3Wk8a3CmAmc28wqL56RXUPGfazEzz X-Received: by 2002:a05:6402:2076:: with SMTP id bd22mr8526455edb.197.1603896471599; Wed, 28 Oct 2020 07:47:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603896471; cv=none; d=google.com; s=arc-20160816; b=GHfwEycHMzjCI/FBFHBnQq3wdKm01alJ9IysJNo47yzzeQaaPiJrJpevWeujMps56a Bu5Po5GFy5v5LoEX/F4LINujvJugKkw5tTln1mu6+6mXc1JEd4P/K1odXOhYiySyH9d1 3YwB3I+IVstBXWQRh0BK0vJ1I/Dmo7S2PnW0BsO0tmZAJipf7bi/1uqgZPEFAFMD8SCL bdQWsPCh/3XNnsUblJe7EqrtiZGvOX9pCsNgK1Fp3t6YP+v3OjrrpVHoyuFG0lc4TXDj VEm9Qu0n2Ftt734L0WyBWJUGqKLIHdXlAXIhQGF+Z6TPmYKByGESzDGvsFn1/reistj7 Bpzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EgOu1XnE11n/9BumM2OwnQB8VNzkY7ZkDXxgUJ90HKo=; b=fukOkzoFqKHvdr+lGN4AAkYUwy2kuIX9hdVwpXfyji/ZcYGmBO2jeRedoZrjl8MCRi NkYb1i0H/smP3wZz+d8HTo0P6GbJa/a09/YDxjJVsBsnn1f0RaKkHqeuv7V4co0+bang ifjw/EvqtnsxLXWMrqQ0qCHTcbpgXMpMFNa6Sx8Jhwby3ITJWdZG2fAyrmdDvNpEAOqn f7Xw7yU/e6WkwHVdli8sE6IL5/rgsod6eNHFVnfWB/OTPEBd1w4aHK+7/UFUgp60BQn2 XNkqRj0udsvHXl2LWeCkxMsr8pk39d584dWR4YK5lYFcYgShBTLh/U4lFJpU0YLL0uhm 9HZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DpbMgSMh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q18si2524555edb.466.2020.10.28.07.47.29; Wed, 28 Oct 2020 07:47:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DpbMgSMh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1807384AbgJ0QJ5 (ORCPT + 99 others); Tue, 27 Oct 2020 12:09:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:56284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1804285AbgJ0PyX (ORCPT ); Tue, 27 Oct 2020 11:54:23 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C4EFB20657; Tue, 27 Oct 2020 15:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603814062; bh=9CFA3euX9rYEbJKVYSLghDfyXSWascRda3Kd8WXBc0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DpbMgSMhQ/Qb+WGm8e4159mozuIAblRo0vsNhflC5oYtByzCXLZ/PHNwM/qfYBHUP xvtVXumXXWSG0/gOt8K86pLwra9oY1Xn/wrxAtvY8Ur8748dKjzV0Byn4M53XLYGIn TqTRhBYkbxMJXI4WZZG5WdSNCz3BB8hXCqGIiCJ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Fan Subject: [PATCH 5.9 750/757] tty: serial: lpuart: fix lpuart32_write usage Date: Tue, 27 Oct 2020 14:56:40 +0100 Message-Id: <20201027135525.695712810@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Fan commit 9ea40db477c024dcb87321b7f32bd6ea12130ac2 upstream. The 2nd and 3rd parameter were wrongly used, and cause kernel abort when doing kgdb debug. Fixes: 1da17d7cf8e2 ("tty: serial: fsl_lpuart: Use appropriate lpuart32_* I/O funcs") Cc: stable Signed-off-by: Peng Fan Link: https://lore.kernel.org/r/20200929091920.22612-1-peng.fan@nxp.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/fsl_lpuart.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -649,26 +649,24 @@ static int lpuart32_poll_init(struct uar spin_lock_irqsave(&sport->port.lock, flags); /* Disable Rx & Tx */ - lpuart32_write(&sport->port, UARTCTRL, 0); + lpuart32_write(&sport->port, 0, UARTCTRL); temp = lpuart32_read(&sport->port, UARTFIFO); /* Enable Rx and Tx FIFO */ - lpuart32_write(&sport->port, UARTFIFO, - temp | UARTFIFO_RXFE | UARTFIFO_TXFE); + lpuart32_write(&sport->port, temp | UARTFIFO_RXFE | UARTFIFO_TXFE, UARTFIFO); /* flush Tx and Rx FIFO */ - lpuart32_write(&sport->port, UARTFIFO, - UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH); + lpuart32_write(&sport->port, UARTFIFO_TXFLUSH | UARTFIFO_RXFLUSH, UARTFIFO); /* explicitly clear RDRF */ if (lpuart32_read(&sport->port, UARTSTAT) & UARTSTAT_RDRF) { lpuart32_read(&sport->port, UARTDATA); - lpuart32_write(&sport->port, UARTFIFO, UARTFIFO_RXUF); + lpuart32_write(&sport->port, UARTFIFO_RXUF, UARTFIFO); } /* Enable Rx and Tx */ - lpuart32_write(&sport->port, UARTCTRL, UARTCTRL_RE | UARTCTRL_TE); + lpuart32_write(&sport->port, UARTCTRL_RE | UARTCTRL_TE, UARTCTRL); spin_unlock_irqrestore(&sport->port.lock, flags); return 0; @@ -677,7 +675,7 @@ static int lpuart32_poll_init(struct uar static void lpuart32_poll_put_char(struct uart_port *port, unsigned char c) { lpuart32_wait_bit_set(port, UARTSTAT, UARTSTAT_TDRE); - lpuart32_write(port, UARTDATA, c); + lpuart32_write(port, c, UARTDATA); } static int lpuart32_poll_get_char(struct uart_port *port)