Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3757495pxt; Tue, 10 Aug 2021 10:36:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz66785vGH7jMXBSxfQJqV0QzI/JDbIB9aMPEWXbmgL+rG1xDsrlri5590jkkMR6QvuQ2CW X-Received: by 2002:a05:6402:4cf:: with SMTP id n15mr6323391edw.269.1628616991703; Tue, 10 Aug 2021 10:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628616991; cv=none; d=google.com; s=arc-20160816; b=suNw0G2/UJies9wS+vpH9Fu5OKF9HCchR0LSYpVPw80TJUXSa4nKZs71ojpGJk6suP oht/oZg9reLuSnN9iCxdm29KswOb2Iokks0oqf9UJtjBL8+VD52D8huGRBDhVm2w4wAb zrfLfsPo0/Av+Pdu9MCyxL8wttAyhrmspy/3wiOgCaOot/OOSenBws9b2lHv1TLnBN+I bwhgrFBFKP/Q4K7Aut3qwAoGYv+oI4z6PomCBTQ4rqSlWwUi7gcTEsShEA6yIniCD60X svFAsRPCHrN76QUNRsQj+OW0/kpAbI0atRKQ13obV7UitFyYbeftNl0roiMQ7NHcJJzM fDDQ== 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=la9T/34cbRe5tbwwWcY2u+wqrJeWHp1a2Qsm161TnTo=; b=gOS9O3l3nTOToMOJTWo6jgXkiLQMIEY3Jo5gsVVMBmrMLeLadpZleeIGkQJfzQYfdS wDwiHLWx+DuzMvJnPdjsKri+A6iz/83FWNDEoYKibevO+RALirJeotUe9wW50wY7WisK gZ9KxB5njv4c/AN1CYpFqYTaB/wzx2+tnQ0hVqPgDoa1yvPiNowCTLwqHoZ8KyulReqv BuSQ4yLGqNN+pZXeCaN7ETnsdWmQEbXYIcKwcG5mK6EwpnPFZ0bL+WtWnWnUd9fnPtmy aK5seEOFBoRGKwKks/SsiYrj/8dKHpFtlgju0oEsvSO1eLo4Hxy5L6PW60usVz7js/uN eUbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WcZAdyyy; 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=pass (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 la2si20888547ejc.153.2021.08.10.10.36.07; Tue, 10 Aug 2021 10:36:31 -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=@linuxfoundation.org header.s=korg header.b=WcZAdyyy; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232363AbhHJReX (ORCPT + 99 others); Tue, 10 Aug 2021 13:34:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:36356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232707AbhHJRdf (ORCPT ); Tue, 10 Aug 2021 13:33:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 22E1F60EBD; Tue, 10 Aug 2021 17:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628616793; bh=6UZ8UDbE+gtZ419+958w1Ct+az9EJtjv+tl1F1V8R0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WcZAdyyy4d6ZeuDdv2mCQsTgO+Gq4Ywpm/7DLGuaoCwMxSCDnpbzfOsqD1aTwUxcu uUoIhHxjQgqK7HNgnMKq1RkkCLaY/IiNEvQ2TQOBVTIH9/8dF3onJ8nOelrMUXizl/ 6qMOFlnzEhWMJ0Wi7YfBgI5VqgWs4ezQOHybcOsE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Maciej W. Rozycki" Subject: [PATCH 4.19 42/54] MIPS: Malta: Do not byte-swap accesses to the CBUS UART Date: Tue, 10 Aug 2021 19:30:36 +0200 Message-Id: <20210810172945.574815329@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810172944.179901509@linuxfoundation.org> References: <20210810172944.179901509@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: Maciej W. Rozycki commit 9a936d6c3d3d6c33ecbadf72dccdb567b5cd3c72 upstream. Correct big-endian accesses to the CBUS UART, a Malta on-board discrete TI16C550C part wired directly to the system controller's device bus, and do not use byte swapping with the 32-bit accesses to the device. The CBUS is used for devices such as the boot flash memory needed early on in system bootstrap even before PCI has been initialised. Therefore it uses the system controller's device bus, which follows the endianness set with the CPU, which means no byte-swapping is ever required for data accesses to CBUS, unlike with PCI. The CBUS UART uses the UPIO_MEM32 access method, that is the `readl' and `writel' MMIO accessors, which on the MIPS platform imply byte-swapping with PCI systems. Consequently the wrong byte lane is accessed with the big-endian configuration and the UART is not correctly accessed. As it happens the UPIO_MEM32BE access method makes use of the `ioread32' and `iowrite32' MMIO accessors, which still use `readl' and `writel' respectively, however they byte-swap data passed, effectively cancelling swapping done with the accessors themselves and making it suitable for the CBUS UART. Make the CBUS UART switch between UPIO_MEM32 and UPIO_MEM32BE then, based on the endianness selected. With this change in place the device is correctly recognised with big-endian Malta at boot, along with the Super I/O devices behind PCI: Serial: 8250/16550 driver, 5 ports, IRQ sharing enabled printk: console [ttyS0] disabled serial8250.0: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) is a 16550A printk: console [ttyS0] enabled printk: bootconsole [uart8250] disabled serial8250.0: ttyS1 at I/O 0x2f8 (irq = 3, base_baud = 115200) is a 16550A serial8250.0: ttyS2 at MMIO 0x1f000900 (irq = 20, base_baud = 230400) is a 16550A Fixes: e7c4782f92fc ("[MIPS] Put an end to 's long and annyoing existence") Cc: stable@vger.kernel.org # v2.6.23+ Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Maciej W. Rozycki Link: https://lore.kernel.org/r/alpine.DEB.2.21.2106260524430.37803@angie.orcam.me.uk Signed-off-by: Greg Kroah-Hartman --- arch/mips/mti-malta/malta-platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c @@ -47,7 +47,8 @@ static struct plat_serial8250_port uart8 .mapbase = 0x1f000900, /* The CBUS UART */ .irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_MB2, .uartclk = 3686400, /* Twice the usual clk! */ - .iotype = UPIO_MEM32, + .iotype = IS_ENABLED(CONFIG_CPU_BIG_ENDIAN) ? + UPIO_MEM32BE : UPIO_MEM32, .flags = CBUS_UART_FLAGS, .regshift = 3, },