From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Thompson Subject: [PATCH tty-next v2] serial: asc: Conditionally use readl_relaxed (COMPILE_TEST) Date: Tue, 23 Sep 2014 08:31:30 +0100 Message-ID: <1411457490-9640-1-git-send-email-daniel.thompson@linaro.org> Return-path: Received: from mail-we0-f177.google.com ([74.125.82.177]:34828 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753890AbaIWHbu (ORCPT ); Tue, 23 Sep 2014 03:31:50 -0400 Received: by mail-we0-f177.google.com with SMTP id t60so4090858wes.36 for ; Tue, 23 Sep 2014 00:31:48 -0700 (PDT) Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: Greg Kroah-Hartman Cc: Daniel Thompson , linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, kernel@stlinux.com, linux-serial@vger.kernel.org, Guenter Roeck , Srinivas Kandagatla , Maxime Coquelin , Patrice Chotard , Jiri Slaby Commit 08177ece596c ("serial: asc: Adopt readl_/writel_relaxed()) is regressing the m68k allmodconfig build. This is due to the unconditional use of readl_relaxed() which, although documented, does not currently exist for m68k. This is trivially fixable for st-asc because we can just update the asc_in() accessor to make this conditional. Reported-by: Guenter Roeck Signed-off-by: Daniel Thompson Cc: Srinivas Kandagatla Cc: Maxime Coquelin Cc: Patrice Chotard Cc: Jiri Slaby --- Notes: Will Deacon is working on a patchset to introduce readl_relaxed (and writel_relaxed) to all platforms. I intend to keep an eye on this work and will remove the conditional code in asc_in/out() when this is possible. Changes since v1: * Added the correct Reported-by: and removed the assertion that the reporter is a build bot. drivers/tty/serial/st-asc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index a3fc167..a316584 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -151,7 +151,11 @@ static inline struct asc_port *to_asc_port(struct uart_port *port) static inline u32 asc_in(struct uart_port *port, u32 offset) { +#ifdef readl_relaxed return readl_relaxed(port->membase + offset); +#else + return readl(port->membase + offset); +#endif } static inline void asc_out(struct uart_port *port, u32 offset, u32 value) -- 1.9.3