From patchwork Mon Feb 11 17:45:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 158020 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2878608jaa; Mon, 11 Feb 2019 09:46:00 -0800 (PST) X-Google-Smtp-Source: AHgI3IYP4qW5CAESVyzxIiWcC5aNXU2uC9Ee5rb/aeNqK8lmAXBlJf2vfoQglK2hzGLeppm6ENr5 X-Received: by 2002:a17:902:2e03:: with SMTP id q3mr30887250plb.330.1549907160228; Mon, 11 Feb 2019 09:46:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549907160; cv=none; d=google.com; s=arc-20160816; b=TKaLE5JFjR+p+xyaSk/xTlYsQIiKadgALX6p/5ED+f+batMXN6xQXzvig0M5FKos9F 0fG0OyEDGGdnPR8fHn4RCYTaz8U6Bywf5kPGYyKhhyrutOZaJEJCbWwHmyyOGacWWqi7 efaP4kQ1FqL37znuvjhy6OfyfwEWh/EsXec4WqCar+TQIt4BnRr6XZ9bPMZYrqAVcQRs OMfCs77rNjyx6spJrCMmJoXHAGBSCpsxorn4DqMY/nl3hqxjR2k0Tk1AoxkrQsDo5i8N kuw3MSQICnhad80C2PeXDoHi1M3jWxOLt+i8j5hES4BsG6Y64Tv1De7+5dNq+TDQyJkQ 11wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=5O++PMZpMFSPPx/IhNSuaR1fS0skPDQLFPMsBfQJh4o=; b=wSRK3+RpLHUxcdfUQ83dGamcG+EDhb1L/OHteGYqQtB5f2gDbJ/fb4oYIumcJcgbNn 3u2UTwi6dcLY0niECRrVcrMohs/WxmHS0Mz9kWxm7SudPBF9B76FgZ42Q5LHVj2HDwcF 0t7gQuMyRT32guzUUIIJUK7TM1lB/8kdgODWCtV9fE3FAhnwptEtH9eF5ZMuRiGg25sX WA87nqOCIoNxQaQT2AYMFvxOVSQBjMv62H8lPhxAM6Hd2/0owNMlGht4lkGYgOS37YDI 9bjdsH2uEF4zRjByuenae+AF9Xi/oHnscA+DlprEjoHPoPoBbUUsVhMv9H+Xil2KQKLC Xtsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i39si6704954plb.256.2019.02.11.09.45.59; Mon, 11 Feb 2019 09:46:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731802AbfBKRp6 (ORCPT + 31 others); Mon, 11 Feb 2019 12:45:58 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54882 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731225AbfBKRpx (ORCPT ); Mon, 11 Feb 2019 12:45:53 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 21556EBD; Mon, 11 Feb 2019 09:45:53 -0800 (PST) Received: from fuggles.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D97813F675; Mon, 11 Feb 2019 09:45:51 -0800 (PST) From: Will Deacon To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, andrew.murray@arm.com, arnd@arndb.de, catalin.marinas@arm.com, Will Deacon Subject: [PATCH 2/2] arm64: io: Hook up __io_par() for inX() ordering Date: Mon, 11 Feb 2019 17:45:44 +0000 Message-Id: <20190211174544.4302-3-will.deacon@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190211174544.4302-1-will.deacon@arm.com> References: <20190211174544.4302-1-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ensure that inX() provides the same ordering guarantees as readX() by hooking up __io_par() so that it maps directly to __iormb(). Reported-by: Andrew Murray Signed-off-by: Will Deacon --- arch/arm64/include/asm/io.h | 1 + 1 file changed, 1 insertion(+) -- 2.11.0 diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index ee723835c1f4..2985febe63ec 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -121,6 +121,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) : "memory"); \ }) +#define __io_par __iormb #define __iowmb() wmb() #define mmiowb() do { } while (0)