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 X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9FA5C433DB for ; Tue, 2 Mar 2021 09:33:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7868F6148E for ; Tue, 2 Mar 2021 09:33:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7868F6148E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JxNzIgRpWWaPNy7km3sM6kLex+FspBlF24KriBG67fU=; b=BjAmbd9sP/CuipZWUJxUxnaNX gIM8o1XX2nKLXOy6CcpTkZXFQZgpX+GCKkiwzlrz+gQNQIWlIeHjdV0L/lqLrkcTvPyETYYTr6/M2 GUHRfHkHARolDxUAqrIu7IKggo3NRL3kyK9fOTbEgJzAVqwfwU672/f7JdY0y+45dQjMYAyE1rdDC 9LiFGYmSLXf8tH/FfzIRQEJSktrl8LM+rhzs6ntCpEJ9KPWXr1N3nG6V8LOJKUlfuWV2/XKsMxENR FZDDKDIkZQ+qt1Gu5MO441xIRspyFkfVq08tC89cZ7Uw33jTRiTW5qw6ZR54M6hIGAvpg1vEFQMip /CB1d9H/w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lH1OR-0002oZ-4O; Tue, 02 Mar 2021 09:32:39 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lH1OO-0002mc-C7 for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 09:32:37 +0000 Received: from mail-oi1-f170.google.com ([209.85.167.170]) by mrelayeu.kundenserver.de (mreue011 [213.165.67.97]) with ESMTPSA (Nemesis) id 1Mgebs-1ligAo09pU-00h9xM for ; Tue, 02 Mar 2021 10:32:26 +0100 Received: by mail-oi1-f170.google.com with SMTP id d20so21300730oiw.10 for ; Tue, 02 Mar 2021 01:32:23 -0800 (PST) X-Gm-Message-State: AOAM530ESBcXOHJCOoOWY3R/Ay8K2p+aseOwtMBwFP4XjaA7JoNJ4Ihk osXnwoTPbt2exrciczJj9Go7SCEVTdu5vBa6b1w= X-Google-Smtp-Source: ABdhPJx5XWp8Ki1644NUPJ6YSXBsqLQpbCENNWA/2WM/vGVPVyb7m95NYVRO672W5xEbCNFsN9VAYmGWDNBc6nbj8WI= X-Received: by 2002:aca:4fd3:: with SMTP id d202mr2418133oib.11.1614677542554; Tue, 02 Mar 2021 01:32:22 -0800 (PST) MIME-Version: 1.0 References: <20210226140305.26356-1-nsaenzjulienne@suse.de> <20210226140305.26356-10-nsaenzjulienne@suse.de> In-Reply-To: <20210226140305.26356-10-nsaenzjulienne@suse.de> From: Arnd Bergmann Date: Tue, 2 Mar 2021 10:32:06 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [RFC 09/13] iommu/arm-smmu: Make use of dev_64bit_mmio_supported() To: Nicolas Saenz Julienne X-Provags-ID: V03:K1:hV9fUVd54ZZdo72DWt0WVRMnHEK/m0FU2mkzWY3XseXQR+4+cQ1 HA74LaU5AOTlF22dzMyyKe2aFRDNiuC4tX51moArctmwKUEhScmat0/pwOnB025heAlB9Oa mhMDAPYeMwUWPGj8gfSaI5D1bGWvZBWfoqZRSKicJJyA2dz1Kz18yPt6OcQTAKUEYr1ju6k OrgziVm6TemcDcYYMISPw== X-UI-Out-Filterresults: notjunk:1;V03:K0:fUDRERBCs9E=:SWQLdDiTHm5pXoqA5Ibc8H dbPAs5g8AvRdK0Rj1syZdrBLwWD/OSTqLXTMcmVoIdYX6U3XE2YtJniNhdWAUglWiHZnHjip7 bMkn9w/ws8BTWVh3tE5+ER4jBEjqenV6ZF21CbF0fSSEfb6kAtqRo/ftISFxTt3PT3w4O2NyZ 9jOnHhtyjWtEEG34R4REeedLearmEKRZD5mewZy6TGKwH/MtnVfGCIhsr8C/gSabxYAMUvKd9 eauPJ3ykmhoqOxU3wGVx63pJB4VnXeZEOIWKDPJv/5G42a9iLmc3a3yNL8t1PwahikgbsYYB4 yp0QPrg+zSivAH+cR6on2uLs2Ul4K63p5ii479zW45R2QXf/arkAck7yI0Nl3cpmN2qk7R4oX I71Xrr97zDqJZMQJddrGqAVU480cw3o+TPK84L1xVDexjnWFCH3t4v1saZcuNvERPCp/b+K+6 qON1NwoPJetR6bbYcVxkez2DtDXu7/7Y8dCbz3niKV5XxfjjoByD X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_043236_623137_A3B6E6BB X-CRM114-Status: GOOD ( 16.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: DTML , Florian Fainelli , Will Deacon , Neil Armstrong , David Woodhouse , "linux-kernel@vger.kernel.org" , Russell King - ARM Linux , Christoph Hellwig , Rob Herring , Catalin Marinas , Robin Murphy , Ard Biesheuvel , Linux ARM 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 Fri, Feb 26, 2021 at 3:03 PM Nicolas Saenz Julienne wrote: > if (smmu->impl && unlikely(smmu->impl->write_reg)) > smmu->impl->write_reg(smmu, page, offset, val); > - else > + else if (dev_64bit_mmio_supported(smmu->dev)) > writel_relaxed(val, arm_smmu_page(smmu, page) + offset); > + else > + hi_lo_writeq_relaxed(val, arm_smmu_page(smmu, page) + offset); > } This is a writel_relaxed(), not a writeq_relaxed(), so I suppose you don't have to change it at all. > + else if (dev_64bit_mmio_supported(smmu->dev)) > + return readq_relaxed(arm_smmu_page(smmu, page) + offset); > + else > + return hi_lo_readq_relaxed(arm_smmu_page(smmu, page) + offset); > } I see this pattern repeat across multiple drivers. I think Christoph had originally suggested folding the if/else logic into the writel_relaxed() that is defined in include/linux/io-64-nonatomic-hi-lo.h, but of course that doesn't work if you need to pass a device pointer. It might still make sense to have another wrapper in that same file though, something like static inline hi_lo_writeq_relaxed_if_possible(struct device *dev, __u64 val, volatile void __iomem *addr) { if (dev_64bit_mmio_supported(smmu->dev)) { readq_relaxed(arm_smmu_page(smmu, page) + offset); } else { writel_relaxed(val >> 32, addr + 4); writel_relaxed(val, addr); } } Arnd _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel