From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::141; helo=mail-it1-x141.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it1-x141.google.com (mail-it1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3F266211BD60B for ; Wed, 30 Jan 2019 07:21:00 -0800 (PST) Received: by mail-it1-x141.google.com with SMTP id i145so10742541ita.4 for ; Wed, 30 Jan 2019 07:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0LxYO9zEp1YWeBEzPkj8YCQSi1eqvksbvHdDi/aH6WQ=; b=JjJl9LyFv8fMwprxhfcS+j3TNDusalIW14lpi6toPhNq+m1CZTxNDzg7j9YOvVsdDi ij8QT4AynbOsJb7nh6E9KCw1Am6xtWl2eV57caaBuWnQzJbjbs/3VifnHlUj+jhqsRV3 cYmfUx4ah4XcpsZRRf0gyzwDUNX+rovKrRAMk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0LxYO9zEp1YWeBEzPkj8YCQSi1eqvksbvHdDi/aH6WQ=; b=qnGTG1TT/s/7MznY7hLC9H/GhDQfFvNF+PWed+XNi1qYhxuVys/72EYcJ5BOqMpkd/ bw7L+TIsP+pYsTxC0sw+ehmucJmLrx8o8Q6xquE+XNuetPkh+uTD5YIqZ8uVllBpI0g3 spcBKxGQv3vipk1bWQ4c0bWkzhBaQO0YrzzL8A0dxtkQSpSyqr0pm+N6qFz13xW+7mrV zIEKT1aLUN/3j/vukk5DKnATymi+TrP1FI+xIDi3ayBRLUxuZfnpa2jCH28MWKy6TH0N fEfBggMJDTo9BRsmU7v6glsU7AUu8vYigOyoy87BvdJymzF3Atios0Xc769lKLMJDMP1 JOeg== X-Gm-Message-State: AJcUukfxwYuMryZJp4KlSNFCUfjBrnu0SRAONxSb2n9eYCUToJNd3ln6 G9mWEAxkU5iHRJ9tzuyO+8FKicxR0MTD65RZp1nAUA== X-Google-Smtp-Source: ALg8bN59H/8RUJfht43+B6UlzXCAnNm5nuTs1UBoU+DKcGAyCd/QjhOw2s0Kz3dJWBsZwgrecwOpI0ppCcy48heHrLY= X-Received: by 2002:a24:710:: with SMTP id f16mr13940499itf.121.1548861659796; Wed, 30 Jan 2019 07:20:59 -0800 (PST) MIME-Version: 1.0 References: <20181106175833.26964-1-ard.biesheuvel@linaro.org> <20181106175833.26964-19-ard.biesheuvel@linaro.org> In-Reply-To: From: Ard Biesheuvel Date: Wed, 30 Jan 2019 16:20:47 +0100 Message-ID: To: Ryszard Knop Cc: "edk2-devel@lists.01.org" , "Kacperski, Kamil" , "Jin, Eric" , "Orlowski, Pawel" , "Kinney, Michael D" , "Hsiung, Harry L" Subject: Re: [PATCH edk2-staging 18/19] IntelUndiPkg/GigUndiDxe: add missing EFIAPI modifiers X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2019 15:21:01 -0000 Content-Type: text/plain; charset="UTF-8" On Wed, 30 Jan 2019 at 16:15, Ryszard Knop wrote: > > I'm going through all the protocols we have defined/used and in > Decode.c/h there's [E1000]UndiApiEntry for PXE/UNDI callbacks. I've > tested an X64 GCC build under OVMF and these calls were broken due to > mismatched calling conventions. Did this work correctly for your builds > on your platforms? > Do you mean the builds were broken? Or the resulting builds didn't work? In any case, that issue only exists on X64, since there are different SysV and MS calling conventions. and GCC uses the former by default. On ARM, there is no such difference. > Reviewed-by: Ryszard Knop > > On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote: > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Ard Biesheuvel > > --- > > IntelUndiPkg/GigUndiDxe/AdapterInformation.c | 3 +++ > > IntelUndiPkg/GigUndiDxe/ComponentName.c | 2 ++ > > IntelUndiPkg/GigUndiDxe/ComponentName.h | 1 + > > IntelUndiPkg/GigUndiDxe/DriverConfiguration.c | 3 +++ > > IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c | 1 + > > IntelUndiPkg/GigUndiDxe/DriverHealth.c | 2 ++ > > IntelUndiPkg/GigUndiDxe/StartStop.c | 2 ++ > > 7 files changed, 14 insertions(+) > > > > diff --git a/IntelUndiPkg/GigUndiDxe/AdapterInformation.c > > b/IntelUndiPkg/GigUndiDxe/AdapterInformation.c > > index 8918c538e447..1cece79911b1 100644 > > --- a/IntelUndiPkg/GigUndiDxe/AdapterInformation.c > > +++ b/IntelUndiPkg/GigUndiDxe/AdapterInformation.c > > @@ -123,6 +123,7 @@ GetIpv6SupportInformationBlock ( > > **/ > > STATIC > > EFI_STATUS > > +EFIAPI > > GetInformation ( > > IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, > > IN EFI_GUID * InformationType, > > @@ -188,6 +189,7 @@ GetInformation ( > > **/ > > STATIC > > EFI_STATUS > > +EFIAPI > > SetInformation ( > > IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, > > IN EFI_GUID * InformationType, > > @@ -234,6 +236,7 @@ SetInformation ( > > **/ > > STATIC > > EFI_STATUS > > +EFIAPI > > GetSupportedTypes ( > > IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, > > OUT EFI_GUID ** InfoTypesBuffer, > > diff --git a/IntelUndiPkg/GigUndiDxe/ComponentName.c > > b/IntelUndiPkg/GigUndiDxe/ComponentName.c > > index 70baf00f4a5d..2bf9bbfbe0e4 100644 > > --- a/IntelUndiPkg/GigUndiDxe/ComponentName.c > > +++ b/IntelUndiPkg/GigUndiDxe/ComponentName.c > > @@ -112,6 +112,7 @@ ComponentNameInitializeControllerName ( > > language specified by Language. > > **/ > > EFI_STATUS > > +EFIAPI > > ComponentNameGetDriverName ( > > IN EFI_COMPONENT_NAME_PROTOCOL *This, > > IN CHAR8 * Language, > > @@ -182,6 +183,7 @@ ComponentNameGetDriverName ( > > language specified by Language. > > **/ > > EFI_STATUS > > +EFIAPI > > ComponentNameGetControllerName ( > > IN EFI_COMPONENT_NAME_PROTOCOL > > * This, > > IN EFI_HANDLE Co > > ntrollerHandle, > > diff --git a/IntelUndiPkg/GigUndiDxe/ComponentName.h > > b/IntelUndiPkg/GigUndiDxe/ComponentName.h > > index 5a3d414c6970..0b93a5410fc0 100644 > > --- a/IntelUndiPkg/GigUndiDxe/ComponentName.h > > +++ b/IntelUndiPkg/GigUndiDxe/ComponentName.h > > @@ -65,6 +65,7 @@ ComponentNameInitializeControllerName ( > > language specified by Language. > > **/ > > EFI_STATUS > > +EFIAPI > > ComponentNameGetDriverName ( > > IN EFI_COMPONENT_NAME_PROTOCOL *This, > > IN CHAR8 * Language, > > diff --git a/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c > > b/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c > > index 20d40ab672ef..99e086d81044 100644 > > --- a/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c > > +++ b/IntelUndiPkg/GigUndiDxe/DriverConfiguration.c > > @@ -310,6 +310,7 @@ GigUndiDriverConfigurationDisplayMenu ( > > @retval EFI_SUCCESS Configuration was successful > > **/ > > EFI_STATUS > > +EFIAPI > > GigUndiDriverConfigurationSetOptions ( > > IN EFI_DRIVER_CONFIGURATION_PROTOCOL * This, > > IN EFI_HANDLE ControllerHandle, > > @@ -418,6 +419,7 @@ GigUndiDriverConfigurationSetOptions ( > > @retval EFI_SUCCESS Always returned > > **/ > > EFI_STATUS > > +EFIAPI > > GigUndiDriverConfigurationOptionsValid ( > > IN EFI_DRIVER_CONFIGURATION_PROTOCOL * This, > > IN EFI_HANDLE ControllerHandle, > > @@ -442,6 +444,7 @@ GigUndiDriverConfigurationOptionsValid ( > > @retval EFI_SUCCESS Configuration was successful > > **/ > > EFI_STATUS > > +EFIAPI > > GigUndiDriverConfigurationForceDefaults ( > > IN EFI_DRIVER_CONFIGURATION_PROTOCOL * This, > > IN > > EFI_HANDLE ControllerHandl > > e, > > diff --git a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c > > b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c > > index aceb015e480f..f6152cd24c59 100644 > > --- a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c > > +++ b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c > > @@ -1394,6 +1394,7 @@ Error: > > ChildHandle did not pass the > > diagnostic. > > **/ > > EFI_STATUS > > +EFIAPI > > GigUndiDriverDiagnosticsRunDiagnostics ( > > IN EFI_DRIVER_DIAGNOSTICS_PROTOCOL * This, > > IN EFI_HANDLE ControllerHandle, > > diff --git a/IntelUndiPkg/GigUndiDxe/DriverHealth.c > > b/IntelUndiPkg/GigUndiDxe/DriverHealth.c > > index b5b7db5fd814..ea306843679a 100644 > > --- a/IntelUndiPkg/GigUndiDxe/DriverHealth.c > > +++ b/IntelUndiPkg/GigUndiDxe/DriverHealth.c > > @@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE > > POSSIBILITY OF SUCH DAMAGE. > > @retval !EFI_SUCCESS Failure to retrieve health status > > **/ > > EFI_STATUS > > +EFIAPI > > GetHealthStatus ( > > IN EFI_DRIVER_HEALTH_PROTOCOL * This, > > IN EFI_HANDLE ControllerHandle, OPTIONAL > > @@ -119,6 +120,7 @@ GetHealthStatus ( > > @retval EFI_UNSUPPORTED This function is unsupported > > **/ > > EFI_STATUS > > +EFIAPI > > Repair ( > > IN EFI_DRIVER_HEALTH_PROTOCOL *This, > > IN EFI_HANDLE ControllerHandle, > > diff --git a/IntelUndiPkg/GigUndiDxe/StartStop.c > > b/IntelUndiPkg/GigUndiDxe/StartStop.c > > index 32bed7ce288d..a788da247e6d 100644 > > --- a/IntelUndiPkg/GigUndiDxe/StartStop.c > > +++ b/IntelUndiPkg/GigUndiDxe/StartStop.c > > @@ -38,6 +38,7 @@ EFI_GUID gEfiStartStopProtocolGuid = > > EFI_DRIVER_STOP_PROTOCOL_GUID; > > @retval EFI_SUCCESS Driver is stopped successfully > > **/ > > EFI_STATUS > > +EFIAPI > > StopDriver ( > > IN EFI_DRIVER_STOP_PROTOCOL *This > > ) > > @@ -62,6 +63,7 @@ StopDriver ( > > @retval EFI_SUCCESS If driver has restarted successfully > > **/ > > EFI_STATUS > > +EFIAPI > > StartDriver ( > > IN EFI_DRIVER_STOP_PROTOCOL *This > > ) >