From patchwork Mon Sep 22 14:16:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 37682 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B7BDE20C03 for ; Mon, 22 Sep 2014 14:16:24 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id n3sf1552014wiv.5 for ; Mon, 22 Sep 2014 07:16:23 -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=o4udjfdAH73KPjF7hZsOlhv7ZQsaBmcQVibuE6jjIS8=; b=ccPlcIPrs3Jf7nQIZMD897DfqmF9qZRZFX5i+EEnjeCE6qRZZxy7WcgXmPHFslSSiC nTDY1vG3uopAFlcJ9WKhX5Tu8k6eNHVL/YosJ+D28I+tqtk67TKdSkn9KBcrJ12h++vS cIjGvaix7DdBe+girxzVZFsRs6XMqAzIr7528YqcsZEuQmBHyTBWMc/SDj84rSDSQ+w0 ybmVbb4RokYWx6TsRUCApVCpCVzSIbovTrV40IzSL1h8/amWxXoqGn2zNxcgsuque1VQ JJaB33V5rNCVUa5KEm7IZPvYAHq3DQUZRKtzgkEYWrQ1OhfcFYIadwAZcum6uU/9IRNB Rn7w== X-Gm-Message-State: ALoCoQmzRIWOSZSJeUHvqrF3JrVqAaScy+rEmndE4rRLTIgYZlgJlm5wN4P0hk3Du6ylAVf6GKG1 X-Received: by 10.112.170.166 with SMTP id an6mr436881lbc.17.1411395383842; Mon, 22 Sep 2014 07:16:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.66 with SMTP id o2ls536574laj.8.gmail; Mon, 22 Sep 2014 07:16:23 -0700 (PDT) X-Received: by 10.112.114.227 with SMTP id jj3mr24631489lbb.39.1411395383705; Mon, 22 Sep 2014 07:16:23 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by mx.google.com with ESMTPS id tj4si14646328lbb.74.2014.09.22.07.16.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Sep 2014 07:16:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id pn19so6748005lab.22 for ; Mon, 22 Sep 2014 07:16:23 -0700 (PDT) X-Received: by 10.112.62.200 with SMTP id a8mr24441203lbs.34.1411395383613; Mon, 22 Sep 2014 07:16:23 -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 of9csp243052lbb; Mon, 22 Sep 2014 07:16:23 -0700 (PDT) X-Received: by 10.180.20.43 with SMTP id k11mr16075814wie.38.1411395383024; Mon, 22 Sep 2014 07:16:23 -0700 (PDT) Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by mx.google.com with ESMTPS id bv10si11272367wjc.168.2014.09.22.07.16.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Sep 2014 07:16:22 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 74.125.82.175 as permitted sender) client-ip=74.125.82.175; Received: by mail-we0-f175.google.com with SMTP id u57so2126296wes.6 for ; Mon, 22 Sep 2014 07:16:22 -0700 (PDT) X-Received: by 10.180.212.11 with SMTP id ng11mr15272099wic.2.1411395382487; Mon, 22 Sep 2014 07:16:22 -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 bg10sm12432816wjc.47.2014.09.22.07.16.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Sep 2014 07:16:21 -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, Srinivas Kandagatla , Maxime Coquelin , Patrice Chotard , Jiri Slaby Subject: [PATCH tty-next] serial: asc: Conditionally use readl_relaxed (COMPILE_TEST) Date: Mon, 22 Sep 2014 15:16:07 +0100 Message-Id: <1411395367-17124-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.215.49 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 upsetting the build bots primarily because m68k allmodconfig builds have regressed. 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. 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. 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)