From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933995AbcIGLVc (ORCPT <rfc822;w@1wt.eu>);
        Wed, 7 Sep 2016 07:21:32 -0400
Received: from szxga01-in.huawei.com ([58.251.152.64]:16485 "EHLO
        szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1757367AbcIGLVa (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 7 Sep 2016 07:21:30 -0400
Subject: Re: [PATCH] arm64/efi: efi_init error handling fix
To: Matt Fleming <matt@codeblueprint.co.uk>,
        Will Deacon <will.deacon@arm.com>
References: <1472811519-4897-1-git-send-email-xieyisheng1@huawei.com>
 <20160902102618.GC17482@arm.com> <20160905135723.GK32579@codeblueprint.co.uk>
CC: <mingo@kernel.org>, <guohanjun@huawei.com>, <mark.rutland@arm.com>,
        <catalin.marinas@arm.com>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, <linux-efi@vger.kernel.org>,
        <ard.biesheuvel@linaro.org>
From: Yisheng Xie <xieyisheng1@huawei.com>
Message-ID: <c57dfbbe-a2a7-e8af-7d94-20f86126053c@huawei.com>
Date: Wed, 7 Sep 2016 19:15:48 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.1.0
MIME-Version: 1.0
In-Reply-To: <20160905135723.GK32579@codeblueprint.co.uk>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
X-Originating-IP: [10.177.32.149]
X-CFilter-Loop: Reflected
X-Mirapoint-Virus-RAPID-Raw: score=unknown(0),
        refid=str=0001.0A090203.57CFF6F0.005F,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0,
        ip=0.0.0.0,
        so=2013-06-18 04:22:30,
        dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-Id: cb1cf694dcad1911b3e0c39a28de4e7e
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org



On 2016/9/5 21:57, Matt Fleming wrote:
> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>>
>>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>>> index c49d50e..5080e40 100644
>>> --- a/drivers/firmware/efi/arm-init.c
>>> +++ b/drivers/firmware/efi/arm-init.c
>>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>>  	      efi.memmap.desc_version);
>>>  
>>> -	if (uefi_init() < 0)
>>> +	if (uefi_init() < 0) {
>>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>>  		return;
>>> +	}
> 
> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> flag also needs clearing.
> 
Hi Matt,
Thanks for your reply.
You mean call the function efi_unmap_memmap() like x86?

however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
EFI_MEMMAP is set in function reserve_regions(), which is called
only when uefi_init() return 0:

efi_init()
   -> reserve_regions()
       -> set_bit(EFI_MEMMAP, &efi.flags);
Thanks
Xie Yisheng.

> .
>