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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 94E20C433C1 for ; Wed, 24 Mar 2021 12:34:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68B3161A06 for ; Wed, 24 Mar 2021 12:34:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233582AbhCXMeB (ORCPT ); Wed, 24 Mar 2021 08:34:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:37630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233176AbhCXMdw (ORCPT ); Wed, 24 Mar 2021 08:33:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC999619BA; Wed, 24 Mar 2021 12:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616589232; bh=D8XIMyFEJVdokD4IDJvnsVYCRV7/Pyl1xPi13fDZEjQ=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=r5SJAsQUdRfsOc2aKosO1XnMsf6Z93iGfv82w9KJqsJlH/M7a8dDemXE5kGXv6Azx qROFfYf7VjYgZ0xdmLQd4igRY2Sg/aMIJa9YxyvoInl14j4zRaHB7X6S8EFhxOqeVi UKPGCfE3TtlU/jXDyO32AcNwh8UFAk4tnS+6CA9nZydo/fwkDX1qZ744+INwgQosWz uQnU8jK5tx/101YpU5u6zByqx6pcsUrGPpE194Iw14WMkU2arFe+UyAWGN9eVn4Cc6 Wszs+hemA9CmQRBt4Pr2nogNkH7nrrS4uLRlzaFWD74JQ8zmAIefLUkGZpERQUFtWs UdlUfV7BVmjyA== Received: by mail-oo1-f48.google.com with SMTP id i25-20020a4aa1190000b02901bbd9429832so5781010ool.0; Wed, 24 Mar 2021 05:33:51 -0700 (PDT) X-Gm-Message-State: AOAM5311MDPLddQd4e5VtdQnqZSiEEvaENVwuJcBs1XWEKmzYzWq31EW jWafmA1yfjYOB2wwRq0GA9h4MYC83KlBn6GpVU8= X-Google-Smtp-Source: ABdhPJyTq/geiE0PC82CfBbsUws5dqUCImGN+4+FTa9zTMtMjpDdfLkXo5pbiAOrgzHsacErpJly1BKVQLsqYGhilWE= X-Received: by 2002:a4a:395d:: with SMTP id x29mr2673227oog.41.1616589231319; Wed, 24 Mar 2021 05:33:51 -0700 (PDT) MIME-Version: 1.0 References: <20210322221441.3555003-1-slyfox@gentoo.org> In-Reply-To: From: Ard Biesheuvel Date: Wed, 24 Mar 2021 13:33:40 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] ia64: fix EFI_DEBUG build To: Sergei Trofimovich Cc: linux-efi , linux-ia64@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org On Tue, 23 Mar 2021 at 18:58, Sergei Trofimovich wrote: > > On Tue, Mar 23, 2021 at 09:35:13AM +0100, Ard Biesheuvel wrote: > > On Mon, 22 Mar 2021 at 23:16, Sergei Trofimovich wrote: > > > > > > When enabled local debugging via `#define EFI_DEBUG 1` noticed > > > build failure: > > > > > > ia64/kernel/efi.c:564:8: error: 'i' undeclared (first use in this function) > > > 564 | for (i = 0, p = efi_map_start; p < efi_map_end; > > > | ^ > > > > > > CC: Ard Biesheuvel > > > CC: linux-efi@vger.kernel.org > > > CC: linux-ia64@vger.kernel.org > > > Signed-off-by: Sergei Trofimovich > > > > What are the other changes for? > > The rest are fixes for format string mismatch in %lx / unsigned long long. > Should I resend with updated comment or split it to another commit? > > They all are hiding under EFI_DEBUG and are not visible by default. > OK, but please describe the purpose of *all* changes in the commit log. Also, the breakage seems to be caused by commit 14fb4209094355928d5a742e35afabdf7b404c17 Author: Ard Biesheuvel Date: Mon Jan 20 10:49:11 2020 +0100 efi: Merge EFI system table revision and vendor checks so you can include a line in the signoff area saying Fixes: 14fb42090943559 ("efi: Merge EFI system table revision and vendor checks") > > > --- > > > arch/ia64/kernel/efi.c | 11 ++++++----- > > > 1 file changed, 6 insertions(+), 5 deletions(-) > > > > > > diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c > > > index c5fe21de46a8..31149e41f9be 100644 > > > --- a/arch/ia64/kernel/efi.c > > > +++ b/arch/ia64/kernel/efi.c > > > @@ -415,10 +415,10 @@ efi_get_pal_addr (void) > > > mask = ~((1 << IA64_GRANULE_SHIFT) - 1); > > > > > > printk(KERN_INFO "CPU %d: mapping PAL code " > > > - "[0x%lx-0x%lx) into [0x%lx-0x%lx)\n", > > > - smp_processor_id(), md->phys_addr, > > > - md->phys_addr + efi_md_size(md), > > > - vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE); > > > + "[0x%llx-0x%llx) into [0x%llx-0x%llx)\n", > > > + smp_processor_id(), md->phys_addr, > > > + md->phys_addr + efi_md_size(md), > > > + vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE); > > > #endif > > > return __va(md->phys_addr); > > > } > > > @@ -560,6 +560,7 @@ efi_init (void) > > > { > > > efi_memory_desc_t *md; > > > void *p; > > > + unsigned int i; > > > > > > for (i = 0, p = efi_map_start; p < efi_map_end; > > > ++i, p += efi_desc_size) > > > @@ -586,7 +587,7 @@ efi_init (void) > > > } > > > > > > printk("mem%02d: %s " > > > - "range=[0x%016lx-0x%016lx) (%4lu%s)\n", > > > + "range=[0x%016llx-0x%016llx) (%4lu%s)\n", > > > i, efi_md_typeattr_format(buf, sizeof(buf), md), > > > md->phys_addr, > > > md->phys_addr + efi_md_size(md), size, unit); > > > -- > > > 2.31.0 > > > > > -- > > Sergei From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ard Biesheuvel Date: Wed, 24 Mar 2021 12:33:40 +0000 Subject: Re: [PATCH] ia64: fix EFI_DEBUG build Message-Id: List-Id: References: <20210322221441.3555003-1-slyfox@gentoo.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Sergei Trofimovich Cc: linux-efi , linux-ia64@vger.kernel.org On Tue, 23 Mar 2021 at 18:58, Sergei Trofimovich wrote: > > On Tue, Mar 23, 2021 at 09:35:13AM +0100, Ard Biesheuvel wrote: > > On Mon, 22 Mar 2021 at 23:16, Sergei Trofimovich wrote: > > > > > > When enabled local debugging via `#define EFI_DEBUG 1` noticed > > > build failure: > > > > > > ia64/kernel/efi.c:564:8: error: 'i' undeclared (first use in this function) > > > 564 | for (i = 0, p = efi_map_start; p < efi_map_end; > > > | ^ > > > > > > CC: Ard Biesheuvel > > > CC: linux-efi@vger.kernel.org > > > CC: linux-ia64@vger.kernel.org > > > Signed-off-by: Sergei Trofimovich > > > > What are the other changes for? > > The rest are fixes for format string mismatch in %lx / unsigned long long. > Should I resend with updated comment or split it to another commit? > > They all are hiding under EFI_DEBUG and are not visible by default. > OK, but please describe the purpose of *all* changes in the commit log. Also, the breakage seems to be caused by commit 14fb4209094355928d5a742e35afabdf7b404c17 Author: Ard Biesheuvel Date: Mon Jan 20 10:49:11 2020 +0100 efi: Merge EFI system table revision and vendor checks so you can include a line in the signoff area saying Fixes: 14fb42090943559 ("efi: Merge EFI system table revision and vendor checks") > > > --- > > > arch/ia64/kernel/efi.c | 11 ++++++----- > > > 1 file changed, 6 insertions(+), 5 deletions(-) > > > > > > diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c > > > index c5fe21de46a8..31149e41f9be 100644 > > > --- a/arch/ia64/kernel/efi.c > > > +++ b/arch/ia64/kernel/efi.c > > > @@ -415,10 +415,10 @@ efi_get_pal_addr (void) > > > mask = ~((1 << IA64_GRANULE_SHIFT) - 1); > > > > > > printk(KERN_INFO "CPU %d: mapping PAL code " > > > - "[0x%lx-0x%lx) into [0x%lx-0x%lx)\n", > > > - smp_processor_id(), md->phys_addr, > > > - md->phys_addr + efi_md_size(md), > > > - vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE); > > > + "[0x%llx-0x%llx) into [0x%llx-0x%llx)\n", > > > + smp_processor_id(), md->phys_addr, > > > + md->phys_addr + efi_md_size(md), > > > + vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE); > > > #endif > > > return __va(md->phys_addr); > > > } > > > @@ -560,6 +560,7 @@ efi_init (void) > > > { > > > efi_memory_desc_t *md; > > > void *p; > > > + unsigned int i; > > > > > > for (i = 0, p = efi_map_start; p < efi_map_end; > > > ++i, p += efi_desc_size) > > > @@ -586,7 +587,7 @@ efi_init (void) > > > } > > > > > > printk("mem%02d: %s " > > > - "range=[0x%016lx-0x%016lx) (%4lu%s)\n", > > > + "range=[0x%016llx-0x%016llx) (%4lu%s)\n", > > > i, efi_md_typeattr_format(buf, sizeof(buf), md), > > > md->phys_addr, > > > md->phys_addr + efi_md_size(md), size, unit); > > > -- > > > 2.31.0 > > > > > -- > > Sergei