From patchwork Tue Sep 23 07:31:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 37724 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B8FAC20970 for ; Tue, 23 Sep 2014 07:31:51 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id q1sf4034849lam.6 for ; Tue, 23 Sep 2014 00:31:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=5FLkPLsv4fLmPxkAo6UOSs9ilum/1AeSEbt2Ihu1R+Y=; b=X6KIRvx121+VeIYsMkgxncTZCZPonpc10EVX1vD/ZPFlUCv9EvkrHPTz1d20nNI5o7 Z3Y+eSFk6BF5rv+SV6KsR3ltOxAfTs6Zr1EHdx9xWoqoAvur7yM96WSIbARCw8h3PR0t 2Yk2LCazah2Cz5SV6dYKLALypctJSJsDZ/Ey9GKrb9eIN4exPA/6A+6QNgf83m9ahZuY o7dSfQWCM3bNGkYDmR6XO76toQ6Mw9yIUnCTnaZuqIyLNelwguWK7xRTcAYTRwlbOdl5 xRRZw6M/nfWgJZMihiO1vMYEgCI92RyATfvgFfKPggxzKcC2LU0A1oKHwpUqY8nC46g9 W7WA== X-Gm-Message-State: ALoCoQkE3PDKyTyU/2Vh5bjZChto1eGBKzpzl0geenVpEsQI2vJScOLSDQ6P++y7c1UxvXQdvUdP X-Received: by 10.194.121.72 with SMTP id li8mr5145143wjb.1.1411457510328; Tue, 23 Sep 2014 00:31:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.133 with SMTP id q5ls14472laj.80.gmail; Tue, 23 Sep 2014 00:31:50 -0700 (PDT) X-Received: by 10.112.150.106 with SMTP id uh10mr28793445lbb.11.1411457510079; Tue, 23 Sep 2014 00:31:50 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by mx.google.com with ESMTPS id t6si17412761lat.51.2014.09.23.00.31.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Sep 2014 00:31:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id p9so7589162lbv.31 for ; Tue, 23 Sep 2014 00:31:49 -0700 (PDT) X-Received: by 10.152.42.136 with SMTP id o8mr8249965lal.71.1411457509679; Tue, 23 Sep 2014 00:31:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.130.169 with SMTP id of9csp366673lbb; Tue, 23 Sep 2014 00:31:49 -0700 (PDT) X-Received: by 10.180.78.226 with SMTP id e2mr1149068wix.68.1411457509080; Tue, 23 Sep 2014 00:31:49 -0700 (PDT) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by mx.google.com with ESMTPS id ky7si13774339wjb.96.2014.09.23.00.31.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Sep 2014 00:31:49 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.182 as permitted sender) client-ip=209.85.212.182; Received: by mail-wi0-f182.google.com with SMTP id d1so4422624wiv.9 for ; Tue, 23 Sep 2014 00:31:48 -0700 (PDT) X-Received: by 10.194.89.67 with SMTP id bm3mr26787859wjb.80.1411457508815; Tue, 23 Sep 2014 00:31:48 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id l4sm618161wje.5.2014.09.23.00.31.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Sep 2014 00:31:47 -0700 (PDT) From: Daniel Thompson 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 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> X-Mailer: git-send-email 1.9.3 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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(+) -- 1.9.3 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)