From patchwork Mon Jan 14 17:01:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155563 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883530jaa; Mon, 14 Jan 2019 09:02:14 -0800 (PST) X-Google-Smtp-Source: ALg8bN7awHRNdY54ml3cuqjbAkGtbW+SwePdfoYxG3zhCWcqg9KNXO4V+bo3sduVjvnF4a34AkdO X-Received: by 2002:a17:902:e18c:: with SMTP id cd12mr24941707plb.279.1547485334066; Mon, 14 Jan 2019 09:02:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485334; cv=none; d=google.com; s=arc-20160816; b=s6wD5wv6y2V79/qHhJizRCaZOkta7gs6ZPS08e1dVKb2c0YAjio85j22QNyrXM9atW W6SJawHv3os4Fi+cU10rsQV/JxBcttdr/X+6hS+t2S582Z3rt0vlH4L7MCq/KFTBmtWL jNcOy8ge52wmaWAvAP5YQCmFS34Czq9uj136m9uDgeXKAKTF6TBOBLGy4EfSisEzV0UT csf4okOnrWFO2nVFrsRskw7FH6zsdiewYhVRhYHBqnPbozJWapMd6uevlDcZIECNJAs3 7sBHbPkhx6jKxncudP7ogKcwjsjMw+A3OYIQenDzHA516xmnLNaAtQOcH7KhBgZtufN6 vsHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=A0wO7zc0ecbth3/67ydmEZ872xlHcG6fBEObL6+grls=; b=inrot58O62jgBAZj7hJQ6LohNhnS9sV/CD23ro+uSau5rcA7iBc616ugS200U/tCdx j1+DZpwsZhBfRabC1EAsyN7MI+IXRbNB8lFZfatDJ26w5Ff+XmdPK7LZ6iF0MEKk0hdU Kt0evwTfqtG0Znyp46A61X6gxQBGseOjXEnnaYtYJ1LLjDh/p+bIoYmNwflgyXeCmJuA cXMTbVLPbgX6fW7TEZWWVnL04iNDxMW2gTN6lpO7AgyaHN2ul//1ygb3HYnNonnM41kg 3ENZdc5EjXHJ8EWoUjB9uBp7RRQf2rPqiCCa2frwGK7p5ZivNo1ft7slu8La3WimzS1W SDLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=c4G7UmTE; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id o1si731273pld.79.2019.01.14.09.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=c4G7UmTE; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 99801211B5A30; Mon, 14 Jan 2019 09:02:13 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 8709E211B5A2A for ; Mon, 14 Jan 2019 09:02:11 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id p6so306274wmc.1 for ; Mon, 14 Jan 2019 09:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CAEbCSBYzLyiJ5uTwT94EvfFH9eK/WOOr2Yws8aC7jo=; b=c4G7UmTEbE9dxFT3a6+e2Pdw0UnKo/0jNV+uUVld3ZIq3wph/wGr0uUFbpbhqnCens vQEIPWriepW0lVjsr9qGxWXIeW1FcGUEJeUtRpe2zawQ3VntQv73Jln/P5VLPFW20xUN L2kmXRmZTFVIwiiWm8d3qHQ9Q2O7WEZogl3ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CAEbCSBYzLyiJ5uTwT94EvfFH9eK/WOOr2Yws8aC7jo=; b=N9fs8W7bVdYpzV3MttGtl5/QG15NVmjv43jXmQiFxOvVuuuxyCmRZGhh1x2TUBLqFm VrdrN9fDl7K0Kvragw8hleYhoZPqGzgZ5FlkVPvltTrJSfoKTGw/wasZkPebnNH+GcQZ QvNIAHxxnK0Vz6Wx1Ffj0wnvWZLuWZc8WIpLqOVnIaUxvTWN4eKombAVKnU/Mua1TfZz 96QCrof4P7u5DyFDq9MftBkAmE4I6Rx1P0NUk3oqKN/oc6zBoub0TGpTuulNZa4YlVt5 8PapfcQpaarwQtULa0QbvYrbFOSVCGx1rCBFJLB2N09GyxF3EP0LjsI5osX0QFNQtu3Y /6AQ== X-Gm-Message-State: AJcUukf4ymSd6/wf6cMbDRqVgo7vaeJyCSnAlS4SzNBD/KIHbvlmgiXM fYc8Bp6NtCB0vBStz/K5jWG6fd5dX/GcDg== X-Received: by 2002:a1c:2856:: with SMTP id o83mr64169wmo.45.1547485329613; Mon, 14 Jan 2019 09:02:09 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:08 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:01:58 +0100 Message-Id: <20190114170205.9748-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 1/8] Silicon/SynQuacer/NetsecDxe: fix 32-bit build 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: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Tweak the definition of pfdep_cpu_addr_t and add some intermediate UINTN casts so that the NETSEC driver builds cleanly in 32-bit mode. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c | 6 +++--- Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c index fa8ae79da28e..1bf1b3cb8f05 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c +++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c @@ -103,9 +103,9 @@ Probe ( ogma_err = ogma_init ( (VOID *)(UINTN)LanDriver->Dev->Resources[0].AddrRangeMin, Handle, &Param, - (VOID *)dmac_hm_cmd_base, dmac_hm_cmd_size, - (VOID *)dmac_mh_cmd_base, dmac_mh_cmd_size, - (VOID *)core_cmd_base, core_cmd_size, + (VOID *)(UINTN)dmac_hm_cmd_base, dmac_hm_cmd_size, + (VOID *)(UINTN)dmac_mh_cmd_base, dmac_mh_cmd_size, + (VOID *)(UINTN)core_cmd_base, core_cmd_size, &LanDriver->Handle); if (ogma_err != OGMA_ERR_OK) { DEBUG ((DEBUG_ERROR, "NETSEC: ogma_init() failed with error code %d\n", diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h index d31a9c48bafc..95796b4cfe6a 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h +++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h @@ -71,7 +71,7 @@ typedef struct { typedef VOID *pfdep_dev_handle_t; typedef PACKET_HANDLE *pfdep_pkt_handle_t; typedef EFI_PHYSICAL_ADDRESS pfdep_phys_addr_t; -typedef UINT64 pfdep_cpu_addr_t; +typedef UINTN pfdep_cpu_addr_t; typedef int pfdep_hard_lock_t; typedef int pfdep_soft_lock_t;