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=-1.0 required=3.0 tests=MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 A5363C43387 for ; Fri, 21 Dec 2018 10:25:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77653218F0 for ; Fri, 21 Dec 2018 10:25:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389501AbeLUKZc (ORCPT ); Fri, 21 Dec 2018 05:25:32 -0500 Received: from foss.arm.com ([217.140.101.70]:49550 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731627AbeLUKZc (ORCPT ); Fri, 21 Dec 2018 05:25:32 -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 959A880D; Fri, 21 Dec 2018 02:25:31 -0800 (PST) Received: from [10.1.197.36] (e112298-lin.cambridge.arm.com [10.1.197.36]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5FED73F5C0; Fri, 21 Dec 2018 02:25:29 -0800 (PST) Subject: Re: [PATCH v7 11/25] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking To: Ard Biesheuvel Cc: linux-arm-kernel , Linux Kernel Mailing List , Daniel Thompson , joel@joelfernandes.org, Marc Zyngier , Christoffer Dall , James Morse , Catalin Marinas , Will Deacon , Mark Rutland , oleg@redhat.com References: <1544633245-6036-1-git-send-email-julien.thierry@arm.com> <1544633245-6036-12-git-send-email-julien.thierry@arm.com> <19500d6b-62a3-21cb-9ac0-a4e5d4714a63@arm.com> <31e41461-763f-aa7d-91ea-b493ede81eed@arm.com> <7d42f570-541a-59a3-79fc-f00dc0b51689@arm.com> <9c64a977-fdee-b2b2-d726-1e9744d229a7@arm.com> <0e6edb8d-dd41-fd3d-0598-7f02ce4ee9ef@arm.com> From: Julien Thierry Message-ID: <361449d8-aaa6-7780-12bb-4b67625b7f00@arm.com> Date: Fri, 21 Dec 2018 10:25:27 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/12/2018 17:53, Ard Biesheuvel wrote: > On Wed, 19 Dec 2018 at 18:01, Julien Thierry wrote: >> >> Hi Ard, >> >> On 14/12/2018 16:40, Julien Thierry wrote: >>> >>> >>> On 14/12/2018 15:49, Ard Biesheuvel wrote: >>>> On Fri, 14 Dec 2018 at 16:23, Julien Thierry wrote: >>>>> >>>>> Hi, >>>>> >>>>> On 13/12/2018 15:03, Julien Thierry wrote: >>>>>> >>>>>> Argh, not as simple as I had expected. >>>>>> >>>>>> Turns out include/linux/efi.h does not include asm/efi.h (including it >>>>>> at the beginning of the file breaks the build because asm/efi.h misses >>>>>> the efi type definitions. >>>>>> >>>>>> So a thing like: >>>>>> >>>>>> #ifndef efi_get_irqflags >>>>>> #define efi_get_irqflags(flags) local_save_flags(flags) >>>>>> #endif >>>>>> >>>>>> in include/linux/efi.h cannot be overridden. >>>>>> >>>>>> Either I would need to introduce the definitions arm, arm64 and x86 (I >>>>>> don't think there are other arch supporting EFI right now) or I'll need >>>>>> to come up with another solution. >>>>>> >>>>> >>>> >>>> It might be a bit nasty, but can we put the #ifndef above in >>>> runtime-wrappers.c directly? The only reference in linux/efi.h is a >>>> macro, so that shouldn't matter afaict. >>>> >>> >>> Sadly, in arch/x86/platform/uv/bios_uv.c, uv_bios_call() has a reference >>> to the macro efi_call_virt_pointer() which wouldn't be able to see the >>> definition in runtime-wrappers.c >>> >>> Otherwise, we could've moved efi_call_virt_pointer() and >>> __efi_call_virt_pointer in runtime-wrappers.c and things would not have >>> been as nasty. >>> >>> But no, I don't think we can do that without breaking some x86 build :( . >>> >> >> Since the above does not work, would the solution with the >> HAVE_GENERIC_EFI_FLAGS below be acceptable to you? Or would you rather I >> defined helpers in for all arm/arm64/x86? >> >> Or neither and I shall find another way? >> > > Would it be possible to introduce a function > > efi_call_virt_save_flags() > > [as a counterpart to efi_call_virt_check_flags()], and put the > implementation in runtime-wrappers.c (which already includes > asm/efi.h)? > > That should allow you to put arch-specific hooks in asm/efi.h, and use > them in the implementation of efi_call_virt_save_flags(). AFAICT, that > removes the need for Kconfig glue. > Yes, that seems to work and does not break other arch. I'll go with that in my next version of the patches. Thanks, -- Julien Thierry