From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47A44ECAAD1 for ; Wed, 31 Aug 2022 20:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:Cc:To:From:Date:References: In-Reply-To:Message-Id:Mime-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aT+Bhe93MziLpk/IEL5hADzCfdoYBUcG7wS5CcRa4EU=; b=ItrwIn7XUIyEH5 uxMrENGwyopd8Upd2Akjz2FMVyHauYjOPA5Ppb1jWazOkqQBF7uSu8Tl5vcVWaSHRW4FIBf1W8CBZ i5D3xP/JTNyKOyKAQZJO2wKgbzmrMa9zOu6ZqvvjV12y37WP7sJiLwBjF/9mEsDUMdFdS6hqq6fM6 IYnLuu+aqRx36mNr3zrROkiNWoGzMQ1wkCK+yUmTTKH/WQeOAdrh3OjSfvbji7XpJPqWoz+loy9f4 GnSEDuo3NVgihzxts4vNtEFfnpyE9TdWq/aJVfzG9f7PfDVbbnoYfgUcgGwMbY7U7/yyWme7SJDdI CO4ABuyZUK1QCB0JBwyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTUlh-008BGx-QE; Wed, 31 Aug 2022 20:57:01 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTUlf-008BDR-Bz for linux-arm-kernel@lists.infradead.org; Wed, 31 Aug 2022 20:57:00 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id B06A258015B; Wed, 31 Aug 2022 16:56:58 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute3.internal (MEProxy); Wed, 31 Aug 2022 16:56:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arndb.de; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1661979418; x=1661983018; bh=1aenuxa+Hq QYGXxzO4SjnMcGBTiII3Nc36j45LlXuHk=; b=cPCij4j5HHa0sQ21xH3KQNo4gf kzCGGAKcJt99J1uzphc3B/zTpBKchrdYYWn7SXQ1/fiUHAVNMmXMa0nTWBKgQd8Z OanBFinUz6O8KnuQz9p6XfVZnmFygpLltp+/RvM9IIOpHqyCOFbOZ/A7s7KLqhCg sK5n82mj/mDs/olEa5LJOejMwH/lkiVxVjiSQkUbbhmK61Jq6sgtyaXqVF0+RYRk JAAGLiDiEL5srkKzFehdKI2RqAJmBSHQwGOdfcJQpcFAPbOVrSQEMQsOjPGTgl83 JO+BQwvwdNpidW8csbDP6XXEg3UCaG4zOgPcQFfDzuqlAdrn2AtGIAqgHHTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= i56a14606.fm1; t=1661979418; x=1661983018; bh=1aenuxa+HqQYGXxzO4 SjnMcGBTiII3Nc36j45LlXuHk=; b=T6IzigEJ+Y90B3oYec0ssLoWqJD+/ctEcU vP/IYLRB1Ws4b1ZWEZteCx++mv9J3iZlXuZflpbkt/fvd6xhYZ7frWld5psdpAB9 sz9+1pPNYswfmCVOWfpGnxcCvoZm8oJPUkhneupvtg6RHLgVsfalaJxCZYAJSQbC tJrMLThpjyDf6KrSSeBxdrVfeR7TUiIOpSkbFDrXtxb4Afvds7Ke3VlCT+asxxvL zq5MIyYrEpjPpWwyYxwfrsvmcrBQkEzV7TT6LbdYs6hQYBLAUi5R6A7tO0IWgd1W 2O/VIiWiTEyu/y5VwJwfRduJlTX6E/j7P5uFVTXD91g0zwEWCq1A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekiedguddvkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvvefutgesthdtredtreertdenucfhrhhomhepfdet rhhnugcuuegvrhhgmhgrnhhnfdcuoegrrhhnugesrghrnhgusgdruggvqeenucggtffrrg htthgvrhhnpeffheeugeetiefhgeethfejgfdtuefggeejleehjeeutefhfeeggefhkedt keetffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe grrhhnugesrghrnhgusgdruggv X-ME-Proxy: Feedback-ID: i56a14606:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 4CAEEB60083; Wed, 31 Aug 2022 16:56:58 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-841-g7899e99a45-fm-20220811.002-g7899e99a Mime-Version: 1.0 Message-Id: In-Reply-To: References: <20220830195520.1668785-1-bvanassche@acm.org> Date: Wed, 31 Aug 2022 22:56:38 +0200 From: "Arnd Bergmann" To: "Russell King" , "Bart Van Assche" Cc: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] ARM: riscpc: Unbreak the build X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220831_135659_497930_98EE5E1A X-CRM114-Status: GOOD ( 22.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Aug 30, 2022, at 11:27 PM, Russell King (Oracle) wrote: > On Tue, Aug 30, 2022 at 01:55:50PM -0700, Bart Van Assche wrote: >> > > >> > > In file included from ./include/linux/io.h:13, >> > > from ./arch/arm/mach-rpc/include/mach/uncompress.h:9, >> >> A bisect led to the following: >> >> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support") >> >> Please let me know if you want me to repost this patch with the Fixes tag >> included. > > That is indeed the cause, and I'd say that the patch to fix it is > incorrect. > > misc-ep93xx.h brings in EP93xx specific raw IO accessors into the > decompressor, but we've already had (and correctly had) linux/io.h > included. > > The problem is misc-ep93xx.h. Why is it defining these accessors? > That's a question for Arnd. The mach-ep93xx uncompress.h had these since the ep93xx got added in 2006, the idea was probably to avoid including linux/*.h headers in the decompressor and it was copied from arch-l7200, which was the first to do the same thing. Having the custom definition was probably never needed on ep93xx even if it was perhaps needed on one of the others that did the same thing. I agree that removing the #include from the rpc version is the wrong fix, but I can see a couple of others that all seem fine to me: - put the '#include "misc-ep93xx.h"' in an #ifdef as we do for the users - rename the custom __raw_writel etc to something with ep93xx prefix, or just open-code them - remove the custom functions and include linux/io.h unconditionally The last one is probably the cleanest, but also the most likely the cause regressions for another corner case. The other two remaining uncompress.h versions each just open-code the pointer dereference. Arnd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel