From patchwork Tue Dec 11 18:35:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153491 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp948984ljp; Tue, 11 Dec 2018 10:35:26 -0800 (PST) X-Google-Smtp-Source: AFSGD/WHl95ou8/g8OXOslVZ8itu1hK7uc8vJTkZtrOEk7CDvp0fLMmYWmMNLcC+7ZdamaAS3vyw X-Received: by 2002:a63:c141:: with SMTP id p1mr15531412pgi.424.1544553326774; Tue, 11 Dec 2018 10:35:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553326; cv=none; d=google.com; s=arc-20160816; b=NFpO82gGgs2lBff+VJztJ+ANov/YllNXL2eOQ2xpzb5/sDNrLI2XPAWoWULWIlsRKp v0691fDZkbgUFeTuhPFa43IvDM8IrEqSbxHhXfCqN8XxrwPPWXkiIwZcepe2BcTOtrFD XYOL3opgHtBcrh128O5AeAK31p0pb3YN0xUZsyMzRupQmCs/FrHzDvcM9Q2XnfgWtLiG Ql0df88urW9Khn/g0DakgQD/FO+TFaExDvkVUTa2DgVH5uGyMCK0Y9QzHGc1GuygX1lC S3zEqNWEaIB3wo005sKwARa1nOVpyAMMbTPOdHu4q0ZVTSwE5H6ZEnXKDUd7dNVb67NO 0AFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=KVZemmrD2hOEo0VosoNJa3iOxl5GQkB5IY9hexRvJXo=; b=XBg8Ve964PtVsr+yVNSbXarCQIzAqsqDLqFNAd7kc4C7T3EzewpLEkIkS6+brm5WeH N/mVpDEo1kfsvGGbOHep2lfWByaUqTwTQFni0fGbwfaMnT0rx5xNfDGsroM0qt8R+fVm R6ULFfF+RrNWjuI3xiYy7aCPsjmLlnZ+7Guz8JUPFKIygebFEsptCvvZBlvLVqcDayZu WHOMPy8ezrPSbm/pYflvx+NLPEG95kGcw6nY7i/8yXyZb38J525oawXFi4TVGTI1YUQ2 orVnuEnJBGqfACkglU4cZD7EzoiliyObWE/JrwOduhI3NadDbHvkWN4bV9H/twYbfOP0 vZbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E6Xi+6WC; 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 j10si10176304plg.123.2018.12.11.10.35.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:26 -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=E6Xi+6WC; 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 0BA252119A46B; Tue, 11 Dec 2018 10:35:26 -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::343; helo=mail-wm1-x343.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (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 9786921199256 for ; Tue, 11 Dec 2018 10:35:24 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id n190so3309532wmd.0 for ; Tue, 11 Dec 2018 10:35:24 -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 :mime-version:content-transfer-encoding; bh=PxHi0WIcBTj2JZSS8M7isXhRqDkaaygaHB7OMzvGxwA=; b=E6Xi+6WC5uC0v1aIM1RwPTW87+MIXmWKYMpd62gFDsKnuI/NAMkeCesaHzTdASUtdr k1CXK73W1vTREoALrWRAumkyqObrNVu+O99L2EwjZeJLJ7IQXWZLFsm++5soaXHI7Ugz Ur01SsKLjzbsJ8m/JAcEcmY5kXRcAHPdQMdLM= 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:mime-version:content-transfer-encoding; bh=PxHi0WIcBTj2JZSS8M7isXhRqDkaaygaHB7OMzvGxwA=; b=f6UzLO1CY2tLEYUVQP5pw42wxfgqXC90KXuMWkB5TVAzBWne4r3nXgvDZB0SlUHEBn fR/BLu/Zlq+HCvqS0t+C7BRbuQGCYIwLJYwLRP6yj1MONscerRmco32StdDs2EerNcDf L7mPTqRkVO+1IrqFxUijz5bTPUEIqdi54wOA46BxoDiL0X9iQL8M2bR4SwWDQMF71OxY mJQ9PMwVc8FIywu+6+ETFcg8vFoglqpa3HDJ0AKTiByIMgrJ4kfIw4kEwKpeU3EzaVeA PoCDlH5MeK+Nw6U/vvdjXIwHOL/2R0urFxYKXRjelLrKI94l8woHvc4IV98pDkal8OM1 nB6Q== X-Gm-Message-State: AA+aEWaxH8ROwrh6M5UV0GOBaK5M16az69XeFTBuCGUKairfH/JXDl/y 3RCZgnOrqRVFsqq3zJgSdWtOKNBKW51hjw== X-Received: by 2002:a1c:384:: with SMTP id 126mr3483616wmd.26.1544553322826; Tue, 11 Dec 2018 10:35:22 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:21 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:04 +0100 Message-Id: <20181211183514.20948-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 01/11] Silicon/AMD/Styx/Iort: drop conditionally included XGBE nodes 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The I/O Remapping Table (IORT) does not require that each device of which it describes the I/O remapping actually exists in the namespace. So let's simplify the code by always including the XGBE nodes, and just let them be unused if the platform does not include XGBE controllers. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 8 -------- 1 file changed, 8 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc index 7723a4ddade3..073b994bc505 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc @@ -60,12 +60,10 @@ typedef struct { STYX_SMMU_NODE PciSmmuNode; STYX_RC_NODE PciRcNode; -#if DO_XGBE STYX_SMMU_NODE Eth0SmmuNode; STYX_NC_NODE Eth0NamedNode; STYX_SMMU_NODE Eth1SmmuNode; STYX_NC_NODE Eth1NamedNode; -#endif STYX_SMMU_NODE Sata0SmmuNode; STYX_NC_NODE Sata0NamedNode; @@ -147,11 +145,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort = { AMD_ACPI_HEADER(EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE, STYX_IO_REMAPPING_STRUCTURE, EFI_ACPI_IO_REMAPPING_TABLE_REVISION), -#if DO_XGBE 10, // NumNodes -#else - 6, // NumNodes -#endif sizeof(EFI_ACPI_6_0_IO_REMAPPING_TABLE), // NodeOffset 0 // Reserved }, { @@ -180,7 +174,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort = { }, { __STYX_ID_MAPPING(0x0, 0xffff, 0x0, PciSmmuNode, 0x0), } -#if DO_XGBE }, { // Eth0SmmuNode __STYX_SMMU_NODE(STYX_ETH0_SMMU_BASE, @@ -265,7 +258,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort = { __STYX_ID_MAPPING_SINGLE(0x1E, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x1F, Eth1SmmuNode), } -#endif }, { // Sata0SmmuNode __STYX_SMMU_NODE(STYX_SATA0_SMMU_BASE, From patchwork Tue Dec 11 18:35:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153492 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949028ljp; Tue, 11 Dec 2018 10:35:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/V+DlYVI/YtafDzvup/xVWd2ZHaCnyJYIRo8KvbUhPhHkhlYJmyJmfNW2bvCoSIzdU9NTGh X-Received: by 2002:a62:3006:: with SMTP id w6mr17523273pfw.258.1544553329789; Tue, 11 Dec 2018 10:35:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553329; cv=none; d=google.com; s=arc-20160816; b=ncFXAxXnGYp/bDavcfcnaKCddTJ7xOxNfnRq1aWjZaX8F8Bh5Bu+3Uhwz1oPD7HrlH at6CORuF65V7RHrR2zTM3CfZ8vI/3OIjfXsDxY3YXerKKJiQFpukLwNdEGnfc//6ZbFP DZAfAk8hmizc15Fr8v6+BGLhaFmMshfXO1Mw1xYg65KvrV9SVuWqvvwd4GQ3RjOgrP8o H2/Y6Qarn5pxZPoHeqnmFPOBsTm+cONyuIfl9ySWYhufzEJRm4JekRz7kJO9Tb8keL1X JiOEHDm8kBkxZt4CSo070Q6aWJTuqO5XjrdVbvsJt8Du5jPd0wxMlc1on6wYikuIw8Jg RglA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=jkkWH2nS7Tw3DprcFffIC18tsdF9o2zKFKsr1LXjHLk=; b=eahYD1BMujIqDQ32/2oouPVAXnGevqFNji7e4S5gztR980lKSxqmSc2sj7Ddo6VdbC 9qc3xnlsDPZ1+TAtu+BFqa9F7PgJeDr4Za7+myqfrKi+QUVkHOHXG+g52o3REBAXirI1 UefrDT4SAUtUIngGXJqApVMFQo9bZ3RDrAJ2q+Tfa2iiokxKIGFfoB+4QgK1qwTGtCy7 B7WR/RgKui8PWl0RvlM6UuFkphWyvQyBwq9gLk6K4gxirXm8ph79wvIKt+/4yiK+7cKi tjxO1l+NJZCxxHXLZ3EHBRW9QAoylo4pGfUrCxiC7D3qpCFDg535Ls6b0aFj+ezBmSiz EjrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LKUOKhb7; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id g34si13227618pld.15.2018.12.11.10.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LKUOKhb7; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 3F0A02119A476; Tue, 11 Dec 2018 10:35:27 -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::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 387202119A472 for ; Tue, 11 Dec 2018 10:35:26 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id g67so3353698wmd.2 for ; Tue, 11 Dec 2018 10:35:26 -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 :mime-version:content-transfer-encoding; bh=JIkgQEWrKwe1qBmsPexeiZNOS57GAp4YCTLp4oH3QCE=; b=LKUOKhb7c26a+cqdLB2DUvtiezGawUZisN8pc3UbyiUaY6nzx91Vb76Eck84hDQgym kmIPYqFLHGF517sH2i75FZReZO4Mk2vKQHbTelApm16Nrd9pzJs6kEymNZ0acYBePjRi EnOwHT1WlfHwE06c951qoCx9LP3GA3Z2h5ciM= 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:mime-version:content-transfer-encoding; bh=JIkgQEWrKwe1qBmsPexeiZNOS57GAp4YCTLp4oH3QCE=; b=hhpADknMbGu6mO4/OxWPQc8vGXpV905TxQoTXqPXxKnjkBVbr/2eXuD+KtJ+Hkvt4k n/I2OLG4KwcP1iTXKO1dQuhCWOp+mMeAdmqyMGnsW8zbOqjdETJSocaw85X0/byC4ABq c2KjrvzzuYjbD/qCYuG0NKrwEwTaxWR++wOFPnlQ/irB3KJJ9eHQwO0+mQ9WhwYJtaJq 1TL7XGkjI1tLeNOysGh3duy856ml/A6Y2mNuJIp0VNVot8U2+rG2vALY3WiL28Qj2Phz w8gL4UE7FBhRe4+E9xueTNwzE9gBn7Ez/Vu0injsP9m+AoX+foBNtiqCWgjX3Qr/62JX GgVg== X-Gm-Message-State: AA+aEWbAHgeopzZAnagJgwPRXITIjIY81ARvhQJHzf14kRc8ceHOzzkQ AOaZ0Vh7y57ZsiCjrnO7JWPE74/eOQjOwg== X-Received: by 2002:a1c:8acd:: with SMTP id m196mr3513564wmd.120.1544553324268; Tue, 11 Dec 2018 10:35:24 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:23 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:05 +0100 Message-Id: <20181211183514.20948-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 02/11] Platform/SoftIron/Overdrive1000Board: remove dead XGBE references 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove the references to the XGBE SNP drivers, which are inside a !ifdef() that never gets enabled anyway. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 8 -------- 1 file changed, 8 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf index 9ba98dd83767..0cf558e189ed 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf @@ -175,14 +175,6 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf -!if $(DO_XGBE) - # - # SNP support - # - INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf - INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif - # # Marvell Ethernet Driver (Overdrive 1000) # From patchwork Tue Dec 11 18:35:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153493 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949072ljp; Tue, 11 Dec 2018 10:35:32 -0800 (PST) X-Google-Smtp-Source: AFSGD/VvLf23hBT7Dbx9awVabI4zQ61hqejTwm7UXc3+8sxJOtU8P9hAHfmKK8jP5p1NRdY7ugmo X-Received: by 2002:a63:d904:: with SMTP id r4mr15591184pgg.207.1544553332641; Tue, 11 Dec 2018 10:35:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553332; cv=none; d=google.com; s=arc-20160816; b=YFNbqkQ0sjUXUvSrhlIoREtjaP0VCuCRHjRi1hHWvfkH/E4286E9Oy37vw/xDryPaH l1eawbzimadKnJO1wTyGXKU5Ti3L2UscfjA3vLShE86eETrEZYYE5V323MIA6BWeRHjU vKWq3G0r+elMKLF/m2UlOb4LnaBK1DViQ9D15KqcUIfp6joxhLNvt1sfqmB48SAr+GoO uJYliFA2Xm2rDqVsipd0aey7MXPLqHIJK0COfaomB2LETzRasF7CDkwwk3ZFciXi+TZm ZB3ZhJbncT2ogQ6TL8exam7TxwlYIAEoFraHJadNArovk0QrFO6DoCn6LiIcYugeAQzf 0RSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cdhh0ecZ89O5gCqOHi1CNoqSFzfBivPmHg0+Aweumwk=; b=ieqZzMrVcNzsrpQOtpQLdEgAUb13mCTF8QYa7CR/akm69cS4sHckLGXwMgt4FGukXe aH/CKXlP+9d8rRhKELL3MHLpK+OdqyBNMvOTrKUjm19l8VXIRoFQJuhRg3y65+yv0Uy1 QHyAHDEaggEwMpL3c6RAmBhW23ysgTYSlLGb67oNolOA7GKTjF4M7QofLsWJ77EwmKhV aJAa896xGyvuzIXPJapj7Lt/RiKOgPPJo0ymTvL5vo7b/T6H2lPVUIe6fcHdJlB/yQEl XOiIoLnW6+hH4q617o9SZomxwBYbebiI3/LsGoah8W9T2QDcql0J0l2bhxDYyEjee1f/ oeGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gdIdYSOt; 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 z186si12587397pgd.90.2018.12.11.10.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:32 -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=gdIdYSOt; 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 6D2212119A86D; Tue, 11 Dec 2018 10:35:29 -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::444; helo=mail-wr1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 EB6D421199256 for ; Tue, 11 Dec 2018 10:35:27 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id z5so15134133wrt.11 for ; Tue, 11 Dec 2018 10:35:27 -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 :mime-version:content-transfer-encoding; bh=cEt0KjzVfw5EGPG4WML7zMdltpjto+Jk+NomA+x1UMo=; b=gdIdYSOtMzL5+zc5UlMIFfjSUImza2eoZNZNQ/B8nCIdjWUXYt+A/0P1t9FEkheI30 lk9qyEt+ZkbDfsas8qtIhflxWh+7MWZtFHBvTdxXm1mCoRQvJUytxTSBzal1r+iisiPI buD4O+DG54/zNW17HdvNYQVjOHJmOAKNJBfKI= 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:mime-version:content-transfer-encoding; bh=cEt0KjzVfw5EGPG4WML7zMdltpjto+Jk+NomA+x1UMo=; b=PQwGzPg0zm6sHBFPqMGnlWrYdJ9XKCFa1TqzovCnljjFIwyU8YEzvaAe1KyNmtKk41 M0j51uVz4bCl6KHyFjpJt6ZToacprBiVUmSB1l7HtaqSAeSZNeMGf9OQAA5OGcPAJU0V iZJCbi0pJ+Thc9wuTM0eC75SsKaANsNEpVu8kXQgg6XstyFe/NwQMWMMAp6CvSr2b7Ma zuueTxIH/mcre7GdmAElrPU6ZilQI1g6wsEEj05AgXfsrvyqKHIljtqPSQEAH9fr4/u4 6hq5i4nxTINEF/JTlt9DcD32MGENFcn8gRC9Vc5icW8FVzKpXcjMe+01+bjpbwD/sTlF cdRw== X-Gm-Message-State: AA+aEWakAXxEmCAsCGzIGySHxe2oSUPI7cq1jIJ4+yjsACYQFpHOPK2Q Mh1J0WAtmrnXVpX3oBWTqQzkaWHBZ4twnA== X-Received: by 2002:adf:f091:: with SMTP id n17mr14457591wro.292.1544553326159; Tue, 11 Dec 2018 10:35:26 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:25 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:06 +0100 Message-Id: <20181211183514.20948-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 03/11] Silicon/AMD/Styx/AcpiPlatformDxe: replace XGBE CPP conditional with PCD 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" We already have a boolean PCD that tells us whether XGBE support should be enabled, so use it instead of C preprocessor conditionals. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 1 + Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf index be885d6aea90..d27431343f4b 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -68,6 +68,7 @@ gAmdStyxTokenSpaceGuid.PcdSocCpuId [FixedPcd] + gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable gAmdStyxTokenSpaceGuid.PcdCntControlBase gAmdStyxTokenSpaceGuid.PcdCntReadBase gAmdStyxTokenSpaceGuid.PcdCntCTLBase diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c index 9c17c38a04bf..9c8c8b09d4a4 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -43,7 +43,6 @@ STATIC EFI_ACPI_TABLE_PROTOCOL *mAcpiTableProtocol; STATIC AMD_MP_CORE_INFO_PROTOCOL *mAmdMpCoreInfoProtocol; -#if DO_XGBE STATIC CONST UINT8 mDefaultMacPackageA[] = { 0x12, 0xe, 0x6, 0xa, 0x2, 0xa, 0xa1, 0xa, 0xa2, 0xa, 0xa3, 0xa, 0xa4, 0xa, 0xa5 @@ -91,8 +90,6 @@ PatchAmlPackage ( } } -#endif - STATIC VOID EnableAvailableCores ( @@ -135,10 +132,7 @@ InstallSystemDescriptionTables ( EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort; EFI_ACPI_5_1_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt; EFI_ACPI_5_1_GIC_STRUCTURE *GicC; - -#if DO_XGBE UINT8 MacPackage[sizeof(mDefaultMacPackageA)]; -#endif CpuId = PcdGet32 (PcdSocCpuId); @@ -158,7 +152,10 @@ InstallSystemDescriptionTables ( break; case SIGNATURE_64 ('S', 't', 'y', 'x', 'X', 'g', 'b', 'e'): -#if DO_XGBE + if (!FixedPcdGetBool (PcdXgbeEnable)) { + continue; + } + // // Patch the SSDT binary with the correct MAC addresses // @@ -173,8 +170,6 @@ InstallSystemDescriptionTables ( (UINT8 *)Table, TableSize); break; -#endif - continue; default: switch (Table->Signature) { From patchwork Tue Dec 11 18:35:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153494 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949137ljp; Tue, 11 Dec 2018 10:35:37 -0800 (PST) X-Google-Smtp-Source: AFSGD/U0tWZlcLinCdodnL+DUGZfKuexmbmQlxMuWwvJ2V7snRdQLIb18j04it+5hF5i2sPGSTAH X-Received: by 2002:a63:9041:: with SMTP id a62mr15168469pge.163.1544553336921; Tue, 11 Dec 2018 10:35:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553336; cv=none; d=google.com; s=arc-20160816; b=xba02R5jbCacWz3/1t5OQcOsl3y4vqPtX+bs5wYdA6D3/KDUAgvDnDA3ykhyHbGqmZ BK1dRJ4Qv2kFW+iQF83/Bs+qt1KibitooIyTO491rTL3+6AIUra3fYsvnyHE7uyGpcDs bpxR+mgTaCFcQmncod9w4AMJ1j4cyA8vnqR6sREc/amveM01ZtrxsvwxQ8+gRpi25YWm pN95pwOm4gg5/Xyndc2SriL7T1OPnMntP8l02lCHMwJbnq3FvBdGmdWmBXn3VunBvcH3 iJMDhVecZeLe99byF1vXf2lIiG9vzq9v/ZWsg5iNRqr0fD5HyQN7Jd5NwJeIVtwcOU3Q a8Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=mKOT2/wIG6W5N3GcaWWiAiedXB1atldOL8cEC4tQuZg=; b=wicYSTd70kN3S85CejLhPkvZA3N1VczOepXIPqBPOhHmWRmTDTEImfD9rwiMEmPwVC jBLkrl+I+SmtFYkWtQobu1J0ugxWHSrkbQBA7t8MD7KlK2q6Nj0VWPW6lzvnvqmfr7jW BRopCqSmgBbOall5kt8rDXLAG24zkYGDrUybg66Q2KsFiXACx/fJVyQ0w8TF2mXWWVxO DJX+XCHGjSMkN8/jfgIdevGjqwLB7jnbfYdn4b56tSilkrWY84nsXkMscsh7jNaUP4c9 AsIwLVGGPdJCkftNGCRrRsmZthtpwLkrhwSQQlLCSJqS6B7Q5KhA/cFFh3780OjUVokJ raWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="jYxYF/RT"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id h91si12883080pld.411.2018.12.11.10.35.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="jYxYF/RT"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 9B3662119A472; Tue, 11 Dec 2018 10:35:30 -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::342; helo=mail-wm1-x342.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 205042119A47D for ; Tue, 11 Dec 2018 10:35:29 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id y1so3259956wmi.3 for ; Tue, 11 Dec 2018 10:35:29 -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 :mime-version:content-transfer-encoding; bh=Kwf56v88IsPOuYUQDkHP1ZI9tHjHxvzBCYF0Z0hhQUk=; b=jYxYF/RTD1J18ak/ER1TrcyU9yR/VcI8eR3aq3j2MRbs80vGPCtLBxkIdvK7KoeWDP ed/dXM1LNAkNplQA/Tg8zFJxNsFnmHHgyz84ZT2MaU/t5mlE27SqMnEk1X1h34FlajJj 7U8nQ516+FH/c0MdOp+dSnOK7FFOrb6lWyxek= 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:mime-version:content-transfer-encoding; bh=Kwf56v88IsPOuYUQDkHP1ZI9tHjHxvzBCYF0Z0hhQUk=; b=RTGjPLNTlO0Frq3phb6kKwnphQ9HYe7L18kqbWV3wA+Bhte6DLq0x9Srzmg4fTX0Uv NVJPIFDmF3Pj9SDNMwpZt7sLx54OYU7qe32oa2QaYK7fYzm7vd9qHRH4AnwEqGh9qOpf Kuj/UsqaJmPkfAoOvwdfHKSHiyvlHY8sRTLSNn8Ie+K4v8wBS3rJoXDnVe8CoPoDX1kg smkidXCp7Tr0A75JpZht0HQa7uX6CQsoB3rQLtU5fc23SEtAizauRKIMjeoBfPa6kT4H GnfRmD7KrGkrIdLhVecF3p3fp+mOu9sTRJWalbYqSRgA05y9xKQblz0p1P9OCFyAcDNi DA0Q== X-Gm-Message-State: AA+aEWYbAlYgF/A+jyT9TdRD0zPNTt3Y7mKOg00IOCU0HxiOPBkupbdH LOOfwca3UxWRlbCJMRQyV8J/y7EUArJsXw== X-Received: by 2002:a1c:66c5:: with SMTP id a188mr3265816wmc.129.1544553327320; Tue, 11 Dec 2018 10:35:27 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:26 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:07 +0100 Message-Id: <20181211183514.20948-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 04/11] Silicon/AMD/Styx/PlatInitPei: replace XGBE CPP conditional with PCD 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" We already have a boolean PCD that tells us whether XGBE support should be enabled, so use it instead of C preprocessor conditionals. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf | 1 + Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c | 41 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf index b8829a4a9c3e..99cf01347ab7 100644 --- a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf +++ b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf @@ -58,6 +58,7 @@ gAmdStyxMpCoreInfoGuid ## PRODUCER [Pcd] + gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable gArmTokenSpaceGuid.PcdSystemMemorySize gArmPlatformTokenSpaceGuid.PcdCoreCount gAmdStyxTokenSpaceGuid.PcdSocCoreCount diff --git a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c index 3cd650eee36b..932be55b600a 100644 --- a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c +++ b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c @@ -121,10 +121,8 @@ PlatInitPeiEntryPoint ( AMD_MEMORY_RANGE_DESCRIPTOR IscpMemDescriptor = {0}; ISCP_FUSE_INFO IscpFuseInfo = {0}; ISCP_CPU_RESET_INFO CpuResetInfo = {0}; -#if DO_XGBE == 1 ISCP_MAC_INFO MacAddrInfo = {0}; UINTN MacSize; -#endif UINTN CpuCoreCount, CpuMap, CpuMapSize; UINTN Index, CoreNum; UINT32 *CpuIdReg = (UINT32 *)FixedPcdGet32 (PcdCpuIdRegister); @@ -217,27 +215,28 @@ PlatInitPeiEntryPoint ( DEBUG ((EFI_D_ERROR, "SystemMemorySize = %ld\n", PcdGet64 (PcdSystemMemorySize))); -#if DO_XGBE == 1 - // Get MAC Address from ISCP - Status = PeiIscpPpi->ExecuteGetMacAddressTransaction ( - PeiServices, &MacAddrInfo ); - ASSERT_EFI_ERROR (Status); - MacSize = sizeof(MacAddrInfo.MacAddress0); - Status = PcdSetPtrS (PcdEthMacA, &MacSize, MacAddrInfo.MacAddress0); - ASSERT_EFI_ERROR (Status); - Status = PcdSetPtrS (PcdEthMacB, &MacSize, MacAddrInfo.MacAddress1); - ASSERT_EFI_ERROR (Status); + if (FixedPcdGetBool (PcdXgbeEnable)) { + // Get MAC Address from ISCP + Status = PeiIscpPpi->ExecuteGetMacAddressTransaction ( + PeiServices, &MacAddrInfo ); + ASSERT_EFI_ERROR (Status); - DEBUG ((EFI_D_ERROR, "EthMacA = %02x:%02x:%02x:%02x:%02x:%02x\n", - ((UINT8 *)PcdGetPtr (PcdEthMacA))[0], ((UINT8 *)PcdGetPtr (PcdEthMacA))[1], - ((UINT8 *)PcdGetPtr (PcdEthMacA))[2], ((UINT8 *)PcdGetPtr (PcdEthMacA))[3], - ((UINT8 *)PcdGetPtr (PcdEthMacA))[4], ((UINT8 *)PcdGetPtr (PcdEthMacA))[5])); - DEBUG ((EFI_D_ERROR, "EthMacB = %02x:%02x:%02x:%02x:%02x:%02x\n", - ((UINT8 *)PcdGetPtr (PcdEthMacB))[0], ((UINT8 *)PcdGetPtr (PcdEthMacB))[1], - ((UINT8 *)PcdGetPtr (PcdEthMacB))[2], ((UINT8 *)PcdGetPtr (PcdEthMacB))[3], - ((UINT8 *)PcdGetPtr (PcdEthMacB))[4], ((UINT8 *)PcdGetPtr (PcdEthMacB))[5])); -#endif + MacSize = sizeof(MacAddrInfo.MacAddress0); + Status = PcdSetPtrS (PcdEthMacA, &MacSize, MacAddrInfo.MacAddress0); + ASSERT_EFI_ERROR (Status); + Status = PcdSetPtrS (PcdEthMacB, &MacSize, MacAddrInfo.MacAddress1); + ASSERT_EFI_ERROR (Status); + + DEBUG ((EFI_D_ERROR, "EthMacA = %02x:%02x:%02x:%02x:%02x:%02x\n", + ((UINT8 *)PcdGetPtr (PcdEthMacA))[0], ((UINT8 *)PcdGetPtr (PcdEthMacA))[1], + ((UINT8 *)PcdGetPtr (PcdEthMacA))[2], ((UINT8 *)PcdGetPtr (PcdEthMacA))[3], + ((UINT8 *)PcdGetPtr (PcdEthMacA))[4], ((UINT8 *)PcdGetPtr (PcdEthMacA))[5])); + DEBUG ((EFI_D_ERROR, "EthMacB = %02x:%02x:%02x:%02x:%02x:%02x\n", + ((UINT8 *)PcdGetPtr (PcdEthMacB))[0], ((UINT8 *)PcdGetPtr (PcdEthMacB))[1], + ((UINT8 *)PcdGetPtr (PcdEthMacB))[2], ((UINT8 *)PcdGetPtr (PcdEthMacB))[3], + ((UINT8 *)PcdGetPtr (PcdEthMacB))[4], ((UINT8 *)PcdGetPtr (PcdEthMacB))[5])); + } // Let other PEI modules know we're done! Status = (*PeiServices)->InstallPpi (PeiServices, &mPlatInitPpiDescriptor); From patchwork Tue Dec 11 18:35:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153495 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949182ljp; Tue, 11 Dec 2018 10:35:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/V6jqAmAPLSe6ne9DQcnFg+SDHbRdceVg3y1xIfL76Fs9Zgoce9wzoTuM2HS21EoldsIzJ+ X-Received: by 2002:a62:32c4:: with SMTP id y187mr18000819pfy.195.1544553340566; Tue, 11 Dec 2018 10:35:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553340; cv=none; d=google.com; s=arc-20160816; b=NEL9CTWGIhtLmLAbUUfpYjPdYrX+bGip+M2R1/uOusxaMKLdiC8FGwzhuNLA2Rv1HU W268cE2O+TwdDp7v3Lf1JGFLRSZMqPuAN0uXX3Z3LauzO5oURJIs5hO0P53iFU7k01vz 7qjGkAk8zT5NQgY0AM3oHeue1qtkI1bjAv6Se2DC7Rl5zo2bhGP8ymGR34tZLnNfEadv 1+9fP+mGW3JTeiMF9oHKmwq13Vh48Fti0PtXKDLq9kMlj2Gqz6HKZcTWzdn4JSRaKrqE EWBNnOKmVEnkVOVZ1I12/vDtv1n2Sqp/1IAxNoRu70u9s0x//+rqHB9n0Fxjx2nQWm99 DI3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=sNz4gw0u6Te82jFbnGGEFrAcr+wgWNQrwiT8vnPM518=; b=HQ+k/lObYKkWvPAJ2+W5lzv2w6lrmZAWfdT2zxb/l3j4rbWmW43qdF2SFPc1SfGpwa 75mIzUYJJuwDihK/cUWs4HsSIkT+FZCR455l4Indc5AKPzbkqEwyq6+oo9IG0xNPQfcV 2brNIc3Px8P+p1Eh8p8hn3dyst2qHuRuToXhoRhnt02Wc+YxBEsQ9Q3481ejHWDoWDAH 7bc4UmTcG4tpg5zXMAhcTNk0+wN4FJSTCk0eQt+xMY5/jTzlfIMrqtiMdSJAV9KWOyZ7 yNK2TqqXZt6wA/gWyYJso4f/LRAdTCcTjG3O0cMXlG+OA3SGFPrCFEvXezMO94WFAhsS HoAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=d9iJ8+ab; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id n33si12751598pgl.336.2018.12.11.10.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=d9iJ8+ab; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 C716E2119AC02; Tue, 11 Dec 2018 10:35:31 -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 87A512119A44D for ; Tue, 11 Dec 2018 10:35:30 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id q26so3336217wmf.5 for ; Tue, 11 Dec 2018 10:35:30 -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 :mime-version:content-transfer-encoding; bh=KNxbnAeENirUl6c8AesROocyKRCa0McmhfRsMYn8HuQ=; b=d9iJ8+ablTZCWwuHOv73aWMSSwpyTk/AGL/aD8oLOewGoBVFtA9deNO2i5vL9WmBuV xjqzw5KfBSQx7VIhU3QjofTFi6OKPZiK2R5yjh56QG+wH2x+FBgGvQV0o4R4crbYjNv2 ycUyfm6nMLP7D7/Bt+oZuH4s6zHXMn2S4CmNw= 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:mime-version:content-transfer-encoding; bh=KNxbnAeENirUl6c8AesROocyKRCa0McmhfRsMYn8HuQ=; b=HSCgy+TbxofvZ16Qr+o7z7kSarVwYEoL6NTQwIaeJPlRLBp0DP08xghphALL1ffWno w5Mm+ZfVyNDpQlBKvugmOUdQ4VDwWAW+VSVzp0NDGO5vYnVVye/AC9uMLBb83VtsZy/z y0KsGZivgCXJ8GM9y/izRI28mV5Bf6q/ylEcZLJp0oSrWnsJgQBIGiHBWeN0mHF5vOmM SkPCGA6GmhqW8ii3s82XuTyALfXNAEqxn9HefPqGFvEGjt2/5J/7zp2AXS8bNa4euVUy ICb1cXDvLIRu068xxXiBD6K0cwwQr97mNuR9HNaN1eq1kTi5wIwg8kCFgcHGh4m1nVI5 fdFQ== X-Gm-Message-State: AA+aEWa6TLm9H1SQ60psSZuLMkamsgMUeH8zyZr5f0jar8VlpdGGINNs jAbO/el+elNqr51IiTI4ovHNldWwshCAeQ== X-Received: by 2002:a1c:9e4a:: with SMTP id h71mr3591053wme.82.1544553328720; Tue, 11 Dec 2018 10:35:28 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:27 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:08 +0100 Message-Id: <20181211183514.20948-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 05/11] Silicon/AMD/Styx/StyxDtbLoaderLib: replace XGBE CPP conditional with PCD 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" We already have a boolean PCD that tells us whether XGBE support should be enabled, so use it instead of C preprocessor conditionals. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 1 + Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 39 +++++++------------- 2 files changed, 15 insertions(+), 25 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf index 87cdcb3e6b25..af57ab24f084 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf @@ -50,6 +50,7 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase [FixedPcd] + gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable gArmPlatformTokenSpaceGuid.PcdCoreCount gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index b1e4984d3fd0..db7d9b077c32 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -161,8 +161,6 @@ SetDeviceStatus ( } } -#if DO_XGBE - #define MAC_ADDRESS_BYTES 6 STATIC @@ -192,8 +190,6 @@ SetMacAddress ( } } -#endif - STATIC VOID DisableSmmu ( @@ -242,7 +238,6 @@ SetSocIdStatus ( { UINT32 SocId; BOOLEAN IsRevB1; - BOOLEAN DisableXgbeSmmus; SocId = PcdGet32 (PcdSocCpuId); IsRevB1 = (SocId & STYX_SOC_VERSION_MASK) >= STYX_SOC_VERSION_B1; @@ -267,13 +262,7 @@ SetSocIdStatus ( DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/sata@e0d00000"); } -#if DO_XGBE - DisableXgbeSmmus = !PcdGetBool (PcdEnableSmmus); -#else - DisableXgbeSmmus = TRUE; -#endif - - if (DisableXgbeSmmus) { + if (!FixedPcdGetBool (PcdXgbeEnable) || !PcdGetBool (PcdEnableSmmus)) { DisableSmmu (Fdt, "iommus", "/smb/smmu@e0600000", "/smb/xgmac@e0700000"); DisableSmmu (Fdt, "iommus", "/smb/smmu@e0800000", "/smb/xgmac@e0900000"); } @@ -285,20 +274,20 @@ SetXgbeStatus ( IN VOID *Fdt ) { -#if DO_XGBE - SetDeviceStatus (Fdt, "xgmac@e0700000", TRUE); - SetDeviceStatus (Fdt, "phy@e1240800", TRUE); - SetDeviceStatus (Fdt, "xgmac@e0900000", TRUE); - SetDeviceStatus (Fdt, "phy@e1240c00", TRUE); + if (FixedPcdGetBool (PcdXgbeEnable)) { + SetDeviceStatus (Fdt, "xgmac@e0700000", TRUE); + SetDeviceStatus (Fdt, "phy@e1240800", TRUE); + SetDeviceStatus (Fdt, "xgmac@e0900000", TRUE); + SetDeviceStatus (Fdt, "phy@e1240c00", TRUE); - SetMacAddress (Fdt, "xgmac@e0700000", PcdGetPtr (PcdEthMacA)); - SetMacAddress (Fdt, "xgmac@e0900000", PcdGetPtr (PcdEthMacB)); -#else - SetDeviceStatus (Fdt, "xgmac@e0700000", FALSE); - SetDeviceStatus (Fdt, "phy@e1240800", FALSE); - SetDeviceStatus (Fdt, "xgmac@e0900000", FALSE); - SetDeviceStatus (Fdt, "phy@e1240c00", FALSE); -#endif + SetMacAddress (Fdt, "xgmac@e0700000", PcdGetPtr (PcdEthMacA)); + SetMacAddress (Fdt, "xgmac@e0900000", PcdGetPtr (PcdEthMacB)); + } else { + SetDeviceStatus (Fdt, "xgmac@e0700000", FALSE); + SetDeviceStatus (Fdt, "phy@e1240800", FALSE); + SetDeviceStatus (Fdt, "xgmac@e0900000", FALSE); + SetDeviceStatus (Fdt, "phy@e1240c00", FALSE); + } } From patchwork Tue Dec 11 18:35:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153496 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949263ljp; Tue, 11 Dec 2018 10:35:46 -0800 (PST) X-Google-Smtp-Source: AFSGD/UTkSgdAxk61XZNpjLSVA1/QuLdJ8AtZOyj8keVjRSr0vKl6WOiIhivMuKi9O3Pk56le6MV X-Received: by 2002:a17:902:708b:: with SMTP id z11mr17024154plk.203.1544553346029; Tue, 11 Dec 2018 10:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553346; cv=none; d=google.com; s=arc-20160816; b=YlsQ4YTkt2Z0SEatYRlpAUTzOcffjVbKQuzSn9gARw3Dpyu2nV2WzTZVNlxpWdUHWv yuGisk+S2oC4dk+aioOejZCUq/nlFCOinPiS+7r52kCfCxxMO2o+CnTv4tZDJWgLWH0y E7l9F3lNfRL2d/rGd8HRbo1BvzUarnFkC1OkkKagl9n3Eo9QemNkv+0kCkefiBQacXaN u6pMxXiyqWCa8aE5t+OtUmSaTG66+9/f2Uvtl9YkhKQjt08R8Ei+n3ZjpsjV2XqufU+z Luq3nINT3R78b+oCBmS/efQDFG6HV9/n/hrggSnRcbC27LSm4z+1fPuz1v+pPO3WzRmX jhbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Vvt027FwoCcCmbTPEX7wy0gFzfwXId2+EfDu1wxlVjk=; b=p2UFU04C+0oRskzt1DB5qGpouoNA1TqrV4P2o2IZvgvG2JeYwtuOI6SdDN5FHtgsrm oDdkexNYwS5b6TTeMA8AdhUifvxW1Tx56/llGo0/y+4gn+c0pfEJSIghbL4yb/dpTCT7 oGEtqlf6DHqy248N47DzOsq3m+7eiHbTaUg9cCD5AL8DBW80VcirVeprOC0BbsXFvDxW 8hC+YQuz7lCEbZm4MhgY+jxjWyIjzVaLWkWuCoiQnKk+8AvRvgdDwHIs9gYSdcZOudDN 6mtlTyHGMDiIQW38E3hKtOTMIGpyeYbrNw0KEFXqVEkts/tzoOW8oShKKKX45yzY3F9N 5KHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2LwJsSz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id w5si11388987pfl.279.2018.12.11.10.35.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2LwJsSz; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 206D32119AC09; Tue, 11 Dec 2018 10:35:35 -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::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 BBB512194D3AE for ; Tue, 11 Dec 2018 10:35:31 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id v13so15171288wrw.5 for ; Tue, 11 Dec 2018 10:35:31 -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 :mime-version:content-transfer-encoding; bh=AjDXq60Bj10lM/slaVhP2ReLF2yDhFJzNGndeu8XLJI=; b=f2LwJsSzwpBFlWTRWqyG75DUpA6i82q5FoNytTW2Sqp02SF9sQ5Iz5bNPyo0VE7YCq 0PQZHdH2xDII2w7aKy0TUTrpocMAvpLeNsQ4wJnS/H5fB1VrSevlJVb27C7HM9xz4y/E O7wC79p3nRgrLWDU4uYAoAVjphzfqRWNmj+6I= 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:mime-version:content-transfer-encoding; bh=AjDXq60Bj10lM/slaVhP2ReLF2yDhFJzNGndeu8XLJI=; b=rguCyi/E8bBoSFbJo/w6Lk9KokViabAwiJp4SeOhP5t7ZsBUesQ1s2xX00jD73uIjf fzYm6sq7feJx9Aolxmw8YbBCvHLjCnFHOAbFSUfXySYiCdr9Ie99+cZgasW0hRgLIIvj YMxLwIFG0NSOgY9zkYtVUjt0q0KX8OqUpq5IbvLrZIDk/iI6xevZFkdn96gNiLqRE4GR nDAEFGv87X/0ZijlqI92RohhZpLl3kmIlUkF0UxYPMTLIdPgZvoPl5g8NXyfFnUQvO74 x2elc/ajbo6DB2EBWLjpVMbvZzevupSYPICjBfhWKKHzHYI0w72jovp7St/iXCS6AMTP vEcA== X-Gm-Message-State: AA+aEWYooGhHUYSqcQhMGNFwTqRdIf3A5rJhhyv0qAoYdferEejEGwrl xJ9uOjVOQR2dabyewj4NiyBYTBtnP3C54Q== X-Received: by 2002:a5d:4e82:: with SMTP id e2mr14055936wru.291.1544553329966; Tue, 11 Dec 2018 10:35:29 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:29 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:09 +0100 Message-Id: <20181211183514.20948-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 06/11] Platform/AMD/OverdriveBoard: drop DO_XGBE C preprocessor defines 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Now that all code relies on the PCD rather than the DO_XGBE macro, get rid of it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 ++------- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 3b680e22cd36..fb524cfc5490 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -17,7 +17,6 @@ ################################################################################ [Defines] -DEFINE DO_XGBE = 1 DEFINE NUM_CORES = 8 DEFINE DO_KCS = 1 DEFINE DO_FLASHER = FALSE @@ -272,8 +271,8 @@ DEFINE DO_CAPSULE = FALSE *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) - GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) - GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) + GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) + GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 @@ -465,7 +464,6 @@ DEFINE DO_CAPSULE = FALSE gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!if $(DO_XGBE) gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable|TRUE gAmdModulePkgTokenSpaceGuid.PcdPort0PhyMode|0 @@ -480,7 +478,6 @@ DEFINE DO_CAPSULE = FALSE [PcdsPatchableInModule] gAmdModulePkgTokenSpaceGuid.PcdXgbeUseMacFromIscp|TRUE gAmdModulePkgTokenSpaceGuid.PcdXgbeRev|2 -!endif [PcdsPatchableInModule] # PCIe Configuration: x4x4 @@ -654,13 +651,11 @@ DEFINE DO_CAPSULE = FALSE MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf -!if $(DO_XGBE) # # SNP support # Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif # # Networking stack diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf index b5c03034a44a..31b9e18d3c29 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -181,13 +181,11 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf -!if $(DO_XGBE) # # SNP support # INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif # # Networking stack From patchwork Tue Dec 11 18:35:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153497 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949338ljp; Tue, 11 Dec 2018 10:35:50 -0800 (PST) X-Google-Smtp-Source: AFSGD/VkgGKTV1CJhNagB/NFIPNABHSbr7gKoYRdPIvxbN02WoqJGii5w2WsITT7cv+iIEzsftNL X-Received: by 2002:a63:9d05:: with SMTP id i5mr14338346pgd.98.1544553350221; Tue, 11 Dec 2018 10:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553350; cv=none; d=google.com; s=arc-20160816; b=K+wcFnejARxU/OxPlzdtoC1fBfwZUMeEquzHDNwlq4yPEPmF5U+ODVG1/WinM/aI1z 4QOU5zcIKzIr5KwGjJjjJOe+woKVz+Ku7Fp1HFr12ZoEotoOyelJCiCfgX8K9tLxQlz+ Lz9bcb/rBmHIMRz/BFonJGATQt7DMijleTCKpkHEdmboFuNJ4gKAeuJ2zYVs6At62f0Z wF+YueGlMHBaRcDy2kHuih/ShB0/aXvCdkJq2TKAtRSi+y1TeEEsLp+RnQSYT8rficz4 qkYVg44dnN0WfeZLbkKhof/ah8mTCIvjSrk2Qv7eGZVatboOW0E3t1wNCCjYxpwH6aet ge1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cRgFwhiLcG8PDRb5MLvDOfkjWTyzWr1egOzmG8ksAHU=; b=rByCDRWi/ydvO4wSEGuOc7Ju5KPbJzZJV9SIM6PldvgFg1RssgUb4Rg4uWG45urBq5 DxoCKIUhYtcbrNYYVuqQIvoGQ8197ZnQ0qN/KxYTDz7pyQ+2Uw9TFgn6tR/+0pVlkxoG Eo2h9/7QU4Prrz9xZC3GUQ4f0sal6XYDAH6RCoRoZR2rK7JwnqtIRsT8n9NqCoLuPBOc qkmcNwXAPWADyTe2SLOe8A4xgb5BfOeH1TAGsayvK1naN8/XeFCjFrohQpgWCMpVksAb rRXZpjduL03AEvC3aPb9zFtjoSP4Woi6I006EdTjdxaVk3Lo/X7nLJ+Cw+kk3GN5u0QZ QAzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ukarnqxr; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id x9si12608582pgh.12.2018.12.11.10.35.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ukarnqxr; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 4E3B72194D3AE; Tue, 11 Dec 2018 10:35:35 -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::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 0066D2119A457 for ; Tue, 11 Dec 2018 10:35:32 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id m22so3374858wml.3 for ; Tue, 11 Dec 2018 10:35:32 -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 :mime-version:content-transfer-encoding; bh=UPwdZhmucUBGeW/AbJHbWjdABBsP46M4XFEjQ3zMJ4k=; b=Ukarnqxrcb7DgW4At61qztWZAT5e1Q/GFNjHqU7X8ZJoCIXTBxzeTfGbNihRFfkthr HS2GzOVxl8LGr274aBy+BwuCTI2XJ39tcD8/icDT1ykzjP7GDZXufcSRYifMJ8UYCmZy EthIHl0LKPLCrFFF+iftn8JHh9rR4xa2WoZzQ= 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:mime-version:content-transfer-encoding; bh=UPwdZhmucUBGeW/AbJHbWjdABBsP46M4XFEjQ3zMJ4k=; b=Q71mU9mc8hlOKnyvtia1PnQ/+ydKViPHHebuDTqwrm44zLqQ1hP9nAfYsqOYY/Pvex DsyEk91k1wYENqXzU+ijBd/ixUQI+56J12QE8uGfXoYeVlyWqajMO45dzIw6j4PbFwKl rFr9jfD90OdQTxDmUstgFRDVAEBwUfVJJa/vUVgcKF+AFOLY6KQxNJ6XtZoMkv5YRMiC YTzgCG+v51B3FaW9A/tyzZCx4qBX/nC8DrnsAK6hkBgxKoG0wm3Loa2HRVGirqMW5ArG RgokMXHnOac4R41eZfeAuoExDABDfvledk3PYM+ecuKagCAgjDDaHzExFyfZCLnbEYN2 8Ecg== X-Gm-Message-State: AA+aEWbiyKk+xYmE3jv+oCugXnAgQtiPNHUDLf653/xFJsUG4AG0glnr VN3ljWbIj9ktYcBX8R9syiZbLoLoUMXRMw== X-Received: by 2002:a1c:448a:: with SMTP id r132mr3318127wma.47.1544553331272; Tue, 11 Dec 2018 10:35:31 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:30 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:10 +0100 Message-Id: <20181211183514.20948-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 07/11] Silicon/AMD/Styx: introduce boolean PCD for KCS/IPMI support 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" In order to get rid of another CPP macro, introduce a boolean PCD that we will set in the platform to enable IPMI/KCS support. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/AmdStyx.dec | 1 + Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 2 ++ Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 2 ++ 3 files changed, 5 insertions(+) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/AmdStyx.dec b/Silicon/AMD/Styx/AmdStyx.dec index c2e691cb5ea4..dedc15565984 100644 --- a/Silicon/AMD/Styx/AmdStyx.dec +++ b/Silicon/AMD/Styx/AmdStyx.dec @@ -103,3 +103,4 @@ [PcdsFixedAtBuild,PcdsDynamic] gAmdStyxTokenSpaceGuid.PcdEnableSmmus|FALSE|BOOLEAN|0xe0000000 + gAmdStyxTokenSpaceGuid.PcdEnableKcs|FALSE|BOOLEAN|0xe0000001 diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index fb524cfc5490..17c936be5085 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -462,6 +462,8 @@ DEFINE DO_CAPSULE = FALSE # map the stack as non-executable when entering the DXE phase gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE + gAmdStyxTokenSpaceGuid.PcdEnableKcs|TRUE + gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable|TRUE diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 5264346a375c..d7eb5f87afa1 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -429,6 +429,8 @@ DEFINE DO_FLASHER = FALSE # map the stack as non-executable when entering the DXE phase gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE + gAmdStyxTokenSpaceGuid.PcdEnableKcs|TRUE + [PcdsPatchableInModule] # PCIe Configuration: x4x2x2 (=2 See Include/FDKGionb.h) gAmdModulePkgTokenSpaceGuid.PcdPcieCoreConfiguration|2 From patchwork Tue Dec 11 18:35:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153498 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949398ljp; Tue, 11 Dec 2018 10:35:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ud4lEhPPJES6S94ojtrNUDPhSLpjTm0S8AzPajkICe4hAfyi2Ebuo2v3fhR2CsOdv3s9eF X-Received: by 2002:a17:902:7443:: with SMTP id e3mr17093944plt.304.1544553353825; Tue, 11 Dec 2018 10:35:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553353; cv=none; d=google.com; s=arc-20160816; b=NfynvR3v8hxr+8RliVgw7z8GjC736X7ZZgTdj8k7Cbs076SVoroqEzngP3MY2gzM1S IrBinQKhEsqHzFBYIFKYUaMtTQDDnnjjieErLpiNRf51K8aSs/g0JgenmxUVymBTDR39 JYuWgpYj8pGI9lAJD/Q/xWP15osNb/yZUq0IMqlRpnK9quRjo2ORKaNbUB4mZ12dtSLu 5mKe0PrWU4XMZiSt1XijXmtBg5ILI1Uuqj2HIjrGlBFa83raho2Jui4WGeaV8+siwoyk TQV7KY4d1vaw9IJ65AoLen/mQOTZc6SVencfWvgOVk8jQEqFQGaXeRQPFcN3WE3eiEH1 +hiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=/sq39RrSum+nDCtMYlg/jGHm6UcsePzxNp+gq3UAGkQ=; b=v0+kEvgh2hDVtBJGxZdt+QGmr2Qfh6rjQ6B9frKJ9v36O54BlV59n2vrwM/f6FxgLq kmIuTYoxj7PGEciE+/IGsWgLD9ZnGxGvk+gA0nEENjMCinrZGAWG6Ho1s0fTj7Ci1Ou6 vKKIJlEwGIn6LNE82OqkSv2DKBwAIBjCe8kWfFy4I+5UQCKduL2cz0rqRMJTp4OJ+DN5 3lCpcKBEdsPmiXtgD8MZq3G2JcpYMB8TV5zCaPfULjIqOg7FyU/xXPf7tn2cEeLdxeTv W6gS4cMlokNBjbykSbN3tu3YYcM+gnnWsX3pAqVABUcG6kiywlQIY6WRN3VMNsuSCsMN djNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ua5EUwUG; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id c7si12547264plz.118.2018.12.11.10.35.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ua5EUwUG; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 7D75721BADAB2; Tue, 11 Dec 2018 10:35:35 -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::343; helo=mail-wm1-x343.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (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 428B92119A44D for ; Tue, 11 Dec 2018 10:35:34 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id y139so3253120wmc.5 for ; Tue, 11 Dec 2018 10:35:34 -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 :mime-version:content-transfer-encoding; bh=77PB661ZdnANpg/fw4EvX3+JLzMM8lFxPalvD+nfUlc=; b=Ua5EUwUGR20kbZ7nKwIQNO4Kg7kD5a4d3fbqugYwUcqU7Tk+NAJG1ug/vwcQjkt3aG lcnIhGA/b70S4p5MlD4875ySKoD/rkS/UTMWY7OKsia4I3hfV5/STewVSbQpw15q+EGL Hl21r6KH/TqlabbtOrnf99xhNtA5iq6TW3USs= 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:mime-version:content-transfer-encoding; bh=77PB661ZdnANpg/fw4EvX3+JLzMM8lFxPalvD+nfUlc=; b=ttszXzCLvZOedaxuL4BXyy/3axvzUqt/qVf9H28/P654serQWaYglF05P/hecTC7HF TxdJZ3B4pfZ4RM1CDwt2q+gu9EySY5fyJEIwR00d4b+vi2J14VOk2AfB783aUyZ/OEkW l3DqB+Z8qO06sFg59BSL+Ow/I5qeQsUpC3aVNl/uqn8SbJv0CBM+wdznn2tGmZPgaFt1 FwVDMYeBuFa7CIfFJS9GPMlq5OTLiXaqSoJc/X+V5wO5+03pjUou2kxtosXZTty6rhHX +UV0h99T+vYMybgjcxMjgQm6R7Si8rmDm6PAq1NV8cHl0vsReAFok/iQO/ygB5Sx4Kyb mfQw== X-Gm-Message-State: AA+aEWYiI0dSNFlREO1v0Z0el0pF8uCOnY8tn5XPz2upZyufCif8mGIs gXgnGIFEk7JO7hdaqc7UCuxEkRjyChbgqQ== X-Received: by 2002:a1c:cf82:: with SMTP id f124mr3499274wmg.95.1544553332422; Tue, 11 Dec 2018 10:35:32 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:31 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:11 +0100 Message-Id: <20181211183514.20948-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 08/11] Silicon/AMD/Styx/AcpiPlatformDxe: move IPMI/KCS device into separate SSDT 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Move the IPMI/KCS device node from the DSDT into its own SSDT, and only install it if we have support for KCS enabled in the platform. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 2 + Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 5 +++ Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl | 25 ----------- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl | 47 ++++++++++++++++++++ 4 files changed, 54 insertions(+), 25 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf index d27431343f4b..f231e0b2ee75 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -39,6 +39,7 @@ Pptt.aslc Spcr.aslc SsdtB1.asl + SsdtKcs.asl SsdtXgbe.asl [Packages] @@ -74,6 +75,7 @@ gAmdStyxTokenSpaceGuid.PcdCntCTLBase gAmdStyxTokenSpaceGuid.PcdCntBase0 gAmdStyxTokenSpaceGuid.PcdCntEL0Base0 + gAmdStyxTokenSpaceGuid.PcdEnableKcs gAmdStyxTokenSpaceGuid.PcdGicVersion gAmdStyxTokenSpaceGuid.PcdGicHypervisorInterruptInterfaceBase gAmdStyxTokenSpaceGuid.PcdGicVirtualInterruptInterfaceBase diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c index 9c8c8b09d4a4..9b1428fc00eb 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -171,6 +171,11 @@ InstallSystemDescriptionTables ( break; + case SIGNATURE_64 ('S', 't', 'y', 'x', 'K', 'c', 's', ' '): + if (!FixedPcdGetBool (PcdEnableKcs)) { + continue; + } + default: switch (Table->Signature) { case EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE: diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl index 60288114aeab..118382371d73 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl @@ -295,31 +295,6 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "AMDINC", "SEATTLE ", 3) }) } -#if DO_KCS - // - // IPMI/KCS - // - Device (KCS0) - { - Name (_HID, "AMDI0300") - Name (_CID, "IPI0001") - Name (_STR, Unicode("IPMI_KCS")) - Name (_UID, 0) - Name (_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0xE0010000, 0x1) // KCS Data In/Out - Memory32Fixed(ReadWrite, 0xE0010004, 0x1) // KCS Control/Status - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,,,) { 421 } // GSIV - }) - Method (_IFT) { // Interface Type - Return ( 0x01) // IPMI KCS - } - - Method (_SRV) { // Spec Revision - Return (0x200) // IPMI Spec v2.0 - } - } -#endif // DO_KCS - // // PCIe Root Bus // diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl new file mode 100644 index 000000000000..3cac427df2d6 --- /dev/null +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtKcs.asl @@ -0,0 +1,47 @@ +/** @file + + SSDT for IPMI controller + + Copyright (c) 2014, ARM Ltd. All rights reserved.
+ Copyright (c) 2014 - 2016, AMD Inc. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + + +DefinitionBlock ("SsdtKcs.aml", "SSDT", 2, "AMDINC", "StyxKcs ", 3) +{ + Scope (_SB) + { + // + // IPMI/KCS + // + Device (KCS0) + { + Name (_HID, "AMDI0300") + Name (_CID, "IPI0001") + Name (_STR, Unicode("IPMI_KCS")) + Name (_UID, 0) + Name (_CRS, ResourceTemplate() { + Memory32Fixed(ReadWrite, 0xE0010000, 0x1) // KCS Data In/Out + Memory32Fixed(ReadWrite, 0xE0010004, 0x1) // KCS Control/Status + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,,,) { 421 } // GSIV + }) + Method (_IFT) { // Interface Type + Return ( 0x01) // IPMI KCS + } + + Method (_SRV) { // Spec Revision + Return (0x200) // IPMI Spec v2.0 + } + } + } +} + From patchwork Tue Dec 11 18:35:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153499 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949466ljp; Tue, 11 Dec 2018 10:35:58 -0800 (PST) X-Google-Smtp-Source: AFSGD/W6v3VGf0QXU+iCxBx2t3q5+J5WXRM665s34MUbrIu+MK94ctP/AYpCakVVlCXaQpGr6t11 X-Received: by 2002:a63:1321:: with SMTP id i33mr15875674pgl.380.1544553358058; Tue, 11 Dec 2018 10:35:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553358; cv=none; d=google.com; s=arc-20160816; b=VJwtncJPN567tBvuQNS9LKPwZNAe+x7Unlb+F7uG74sgnKJoxWrVdvb70oS8BznJH8 say0zxKqp/MLcJ36H0NbyslhQ+XAsvR0AokTknwO/30XF2YVlg/fB4YG8zA/rAnCyY4I LRBG1En9W7Kn6YIXoBEzRgGCisDakD17dktnt8WTEY1HUQqC5KYPVhaznz7z9nbfpBUk 6pl8afPSbl2UEMUCKE8XvF1pVDag4Qhp9AfkJ1RHdE8KrYNcKWPq9S1lj2zBvzHz7KqJ Nb45AfAksXGbWD982RO0uEbfJINkYtJfXlrZ7hx1SZf+nv7Rspu370iXzD1O3BkpjOfv UREQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=TeJPorZzdVg0KmHuhL3bamUAOWMDUclVOb2gKlM8i2Q=; b=RiqAksP6DO3ZJjEFAxNo7udC9dLHdAMrC22qmOL4qb3rp611JkXfQjWXP6en/pCUMx TIl+lQOmxzulbJlO+bfgx9hT823Dvdi7EArWp5A6mhOfLliCgiKoUc3jpVFshl12sb+/ bN/K+ufBFwx4Fl6UuUJerPk660VHntYNDelDWNFonFp0L/mnLO8+fX0vwj0NX+PjA27g rvXhVxJ0TpN2Tm1jfx1JS39ZR8UJ65X8d3YPH+rIv6GfVZlVEz2MwnruQDRa4A1GDVB7 jxztLHws1UzmJrVYnLYk15CIwRO+kocHUwmMJFkQZ3SOy0xlN0hg7solFTL/VBDeZiSJ pnaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="HyyEF/8B"; 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 l6si11892236pgg.592.2018.12.11.10.35.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:58 -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="HyyEF/8B"; 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 A95442119A457; Tue, 11 Dec 2018 10:35:37 -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::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 A672521BADAB9 for ; Tue, 11 Dec 2018 10:35:35 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id s14so3307041wmh.1 for ; Tue, 11 Dec 2018 10:35:35 -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 :mime-version:content-transfer-encoding; bh=acPRjAm1LSHioxJowt59fUDI3OFAO0qahki8/64jPfE=; b=HyyEF/8Br+d7VHeIxjBV7OwrTLh9W2ovgFeEk/k41ee2A0eLD+29bkxYnEVGrVNaY/ A1t2gQfkUin+WTbokmbpF70VkdUJ4MHYKoVSUsWZNrBCa8ySZQx4OWSl1r4dLtCs/XNJ 7DBwLusRKam3A2K+ypBscHFit1CTomOhEwJ5Q= 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:mime-version:content-transfer-encoding; bh=acPRjAm1LSHioxJowt59fUDI3OFAO0qahki8/64jPfE=; b=Sp4xL4z6DF1fAWPuTnent6+5EYpgh9NaA63H8FuJBcMDM8+LLbZEafS10y/XG2ZR1l 5x4y5dH7UUaoGKyUK6mkH5CqLXKE8KFq/EpivAsEGW5TDEp8yuf6U6/kI4k0HqxMnaZA dyEo5Kgw993Im2nu/ODC54AxeyQ2dRV5wnpGOwnrIe2YmmxCcutqJ6VYauyE0EAYR4z9 JAUDDTh4bIPKub9ud9EcwdCMn2NIVZ6WV48G2zNEXSXlGMs9UjpMAG3SBBgE0f4j8wpP Ikd5iyZQT6GodzEKaSsTDPI6PkiHpihUgz8oRTIcqX/MBR+HGnpCJl3yxAJCpwiR3+sN 0/IA== X-Gm-Message-State: AA+aEWbt0Uf+PvuFY57VwucuXHFDEqsjINxjLeeajClOnKB31hx6lfxv KtjdpH/JPJAShP1xPRlSXp9NjrdBgf1JPg== X-Received: by 2002:a1c:8acd:: with SMTP id m196mr3514067wmd.120.1544553333953; Tue, 11 Dec 2018 10:35:33 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:32 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:12 +0100 Message-Id: <20181211183514.20948-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 09/11] Silicon/AMD/Styx/StyxDtbLoaderLib: replace DO_KCS macro reference with PCD 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Get rid of the CPP conditionals, and use the new boolean PCD for KCS support instead. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 1 + Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf index af57ab24f084..23c5e563bbb6 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf @@ -54,6 +54,7 @@ gArmPlatformTokenSpaceGuid.PcdCoreCount gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment + gAmdStyxTokenSpaceGuid.PcdEnableKcs gAmdStyxTokenSpaceGuid.PcdSata1PortCount [Guids] diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index db7d9b077c32..248eda7c8a95 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -247,11 +247,12 @@ SetSocIdStatus ( SetDeviceStatus (Fdt, "gpio@e0020000", IsRevB1); SetDeviceStatus (Fdt, "gpio@e0030000", IsRevB1); SetDeviceStatus (Fdt, "gwdt@e0bb0000", IsRevB1); -#if DO_KCS - SetDeviceStatus (Fdt, "kcs@e0010000", IsRevB1); -#else - SetDeviceStatus (Fdt, "kcs@e0010000", FALSE); -#endif + + if (FixedPcdGetBool (PcdEnableKcs)) { + SetDeviceStatus (Fdt, "kcs@e0010000", IsRevB1); + } else { + SetDeviceStatus (Fdt, "kcs@e0010000", FALSE); + } if (!PcdGetBool (PcdEnableSmmus)) { DisableSmmu (Fdt, "iommu-map", "/smb/smmu@e0a00000", "/smb/pcie@f0000000"); From patchwork Tue Dec 11 18:35:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153500 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949530ljp; Tue, 11 Dec 2018 10:36:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/XXRC5hQ3YMQnxc2/eYWrLW2+lfTR8m48QTU+gRlscr1CJ0ZVMgUtRS3UDurDRPWtTNQ62r X-Received: by 2002:a17:902:8f97:: with SMTP id z23mr17245037plo.283.1544553362113; Tue, 11 Dec 2018 10:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553362; cv=none; d=google.com; s=arc-20160816; b=x19i36J7yI9bwWdjD4fJEYgoDQNmo0v6tHB6Pr4smhmEoM4KERVGXEz24b2eVs5mtu bcGQ0aSoilqlWUEorJAJBAJ5kYLuVIjHQu0/K69ewcF1FAsK4Hau6/MrRKgDBm61NHpD 6FGfGfsvIwHm+dWOE3jMyGgbxJLaMGK66mCicmgv4/rsrec1Rq4MkJwbVTN9iD66PxJC bxml71z3N195eedZEMqSQlrKv3rmmMWnbudiIOnJIzYn5BQQjUcRTOwGWL+/39JfoHzv K0H8848o5HtWHTyifPrNZ2RfEOESub4chxiIxQ373JdWfXXjupDDM5/JXZ1liUT9N5Rl pJ+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=QSJwEN3fOXQ+jfA4fICJnB0kQFlfiFtq0Vld/oyZo+I=; b=gKxs0E46BMticY2hFHbE9QP436O9Fc+TrfuXStOb3kNeCT1MrID+b0uopdK2ka3wkf nyy/nV1uIo0FDHvJfkNGZ1o1wbvzjNVooo0Uo6uiWWzB+3keKJz934tBCEZfy1vTVkXI WDJclfekUMN3ARW4voj27O16b3IIIn2NLq8ZkQxsMCbTLTW+x24j3VoHBY795Pyv8/a/ kW6pYu+1P/ktbTpIftCTafxB/kIVMdBxFnDnwSbgXwcjyhywpBT0uXX1Q3wbuO7NQ0lF zedF+lXeMDV4EGmyqhcenmnHh/hjiNJsok+WX1L5GsslLzd+nU1CrlOSaUiS/zK28RFO CYZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kCYkmeBS; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id n125si13517370pga.179.2018.12.11.10.36.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:36:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kCYkmeBS; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 D8C2D2119AC0E; Tue, 11 Dec 2018 10:35:37 -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::442; helo=mail-wr1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (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 04C362119A44D for ; Tue, 11 Dec 2018 10:35:36 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id z5so15134546wrt.11 for ; Tue, 11 Dec 2018 10:35:36 -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 :mime-version:content-transfer-encoding; bh=e4s1Kfpf5D6AHPV4eYQ9gFZ8I6KFKeluSGC0DsqHGEg=; b=kCYkmeBShN/EsYwu4G3I5sfd3w+EzPFadt7k6AnssZUMsjLOvbgNSvXHmgBKYaQZi3 ZksX804EKqJIB/DShQsl3KyswivDXrfF5bMItdHQSqPgy46wNV2OSgOR5W+ckL5gRHQ4 23YzFrvOTBC7UQ0f5FrNod2Yi6SWcWUjeZpE8= 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:mime-version:content-transfer-encoding; bh=e4s1Kfpf5D6AHPV4eYQ9gFZ8I6KFKeluSGC0DsqHGEg=; b=LKjJVB9HI1SqP9r7o6JqVKUmES3dAwehth5BeQJno/t1329/fmtY6UBSv7aASfeyNo FTmcbO6YpeCmIIP9xF/9JyHPgbLRWEvaE2FkdRlA5GQwZqnytxlB/vR0rqgGmu+dtpVW wY+cAyBivMge/4PDtnYvw9ktCyn9GduuDIz/mwR7APHN/FYzzz7O3Zl1A75W4BmTA6Sz Jxa7EdFQMP+jFuU3Y6qLdtyIHXQVmfE0Qe5tRgawUAWZdBUM7qldx7fYhBU/Rewfj++b YSqYaOvw2nfOmuSQd9sDSSDmQwl+cbco8U7pQ6ErPayghDWD3ZMfvB7Sp2+IJa/RDlSw TWsQ== X-Gm-Message-State: AA+aEWZQ/Ax66SK2tJ9GeG3QHUyIwZJJw6XhARQGJ36jzL/Ntsj+7A81 mZ3tmKDaMuF8g6syK8V4J/Obqe9eOEXrZw== X-Received: by 2002:adf:f091:: with SMTP id n17mr14458009wro.292.1544553335158; Tue, 11 Dec 2018 10:35:35 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:34 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:13 +0100 Message-Id: <20181211183514.20948-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 10/11] Platform/Styx: get rid of DO_KCS preprocessor macro 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Now that all code references the PCD instead, let's drop the macro from all Styx platforms. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 8 -------- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 -------- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 8 -------- 3 files changed, 24 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 17c936be5085..3d0544cf74cd 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -18,7 +18,6 @@ [Defines] DEFINE NUM_CORES = 8 -DEFINE DO_KCS = 1 DEFINE DO_FLASHER = FALSE DEFINE DO_CAPSULE = FALSE @@ -267,13 +266,6 @@ DEFINE DO_CAPSULE = FALSE RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG - *_*_*_ASL_FLAGS = -tc -li -l -so - *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) - *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) - - GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) - GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index 6362ab5a17fb..a70f91bb02d5 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -18,7 +18,6 @@ [Defines] DEFINE NUM_CORES = 4 -DEFINE DO_KCS = 0 DEFINE DO_FLASHER = FALSE PLATFORM_NAME = Cello @@ -256,13 +255,6 @@ DEFINE DO_FLASHER = FALSE RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG - *_*_*_ASL_FLAGS = -tc -li -l -so - *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) - *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) - - GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) - GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index d7eb5f87afa1..722c4adb7a72 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -18,7 +18,6 @@ [Defines] DEFINE NUM_CORES = 4 -DEFINE DO_KCS = 1 DEFINE DO_FLASHER = FALSE PLATFORM_NAME = Overdrive1000 @@ -254,13 +253,6 @@ DEFINE DO_FLASHER = FALSE [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG - *_*_*_ASL_FLAGS = -tc -li -l -so - *_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS) - *_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS) - - GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) - GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 From patchwork Tue Dec 11 18:35:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153501 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp949615ljp; Tue, 11 Dec 2018 10:36:07 -0800 (PST) X-Google-Smtp-Source: AFSGD/XNA1542hS0LqFp1x+PPbU/NGCruYjrz53XlTb7pTJyFS/3iggwxWtdi9FbycYazMp5FPXN X-Received: by 2002:a62:4181:: with SMTP id g1mr17241959pfd.45.1544553367037; Tue, 11 Dec 2018 10:36:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544553367; cv=none; d=google.com; s=arc-20160816; b=Oj0EEYa00kyG5+0D+eY/6y42UirEyUcwOzxA7U94xvs8Yb2g6wrtCoSkR/z93EnUGB QfZhVEnj5pLWFJh+UzAceHJ1uOpQivuxUKHxSgfxCnbano1AWzI2yQaNW1ZBkgT+BEPD 5sUIYbn/i1ctwnUM6Q98TCNtqgYsg8umB+jfRTaR9EJhr05dXnX+rUFWHaHSKt9wnXBN BNnKA58tB11LO3Ras4bSyqtC8cKMwE2pJFCYIN+Bu5qp1zh+XYn4IJ9eKDVQ0EZYXXQe Epkk1dZ+KWLwDnJXlfxgapLFZjXbFB+pIq75MHvt8Pg67wXNUvxSo4b2+UPyxtcDemnH N4mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=lL46kai8OZucNttiHPQ9GwjfbvoJ/dZ4JpB9tn1b/YA=; b=Z5aBwUui0G/hOSGyFf03wdkpA/4oqx21zioYT9TM/oAncfn+tBZwc5+1vU7upS0fWe WzAX9b3cwzsCLRIhE1Ys1ZdRxi4wl546UunjG8nCj2yXVIyhcjMytMGnCV+p+7hCWQ9r bqLH/BXa/ge7WNn+m8F0JHekDVAPUMikLynwd9guelTfql4Yfm4zLSWWS4GzYwyHM3lt //NCMwfg9mBESZF+flYzWx1m36oS0pFSxoTXv7VCIPSAP7SX7IymBLztksB37NYHp6s3 hfFLstZ/mQq66tQzZufbgic5WhVAjUEvFkjwBKW3RmiuuGf+b5itpcsvwhIBBtOb1rYJ H1qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MGjUYBMR; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id y5si12255364pgs.588.2018.12.11.10.36.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:36:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MGjUYBMR; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 151ED2119AC12; Tue, 11 Dec 2018 10:35:40 -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::444; helo=mail-wr1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 2D2242119AC0C for ; Tue, 11 Dec 2018 10:35:38 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id p4so15160691wrt.7 for ; Tue, 11 Dec 2018 10:35:38 -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 :mime-version:content-transfer-encoding; bh=0juioVc74NmguxM/+AlicgtK/08nEAsVvfbtNMeZ7c0=; b=MGjUYBMRzKAPd5oAnSvsoFqBo/vhamI5BuI5v+KoujTUOzeT03o4gpTiebPs6KqKwv 3/V5hQSYHhH0fDfWAflfNkZrMsRAvAr3ZriG4IVIiScuzywcFUQCb37GELX9yNP5NJJT PJoi2UFvMeUf511h/wsTl2zTQntrnWpWFAYzc= 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:mime-version:content-transfer-encoding; bh=0juioVc74NmguxM/+AlicgtK/08nEAsVvfbtNMeZ7c0=; b=qd1WpcDToxyaGucz1ngDGDPZKvDJsXwlqE2OvpUMfl0/xy2b+Y85Ykmsu4Fz5JzQ7f YI2VtzILsyvxYzMXrHKJdWxZ+35k496YZSdYH5PXK3D7xMi33q2hLIo0qC+XxlM7khYI m5LO0cyzZPreOZOY3UpOZekcPfgTqvbgM9w/gac6AOuKBLFcXEiffTyJ0GE0t1J7iIYB 3wK/7bymkIif5ZQkjRIt+yVhUYh7gxaBxt9f+F2UbX625Nsuuw/ckSFwUMcb5zlhytN8 kZAQglpKCa9jnH9xb2Q6Ypd1RPPMuO6/hUgeDuGXj6ylbIvE8LCODzDP3kN8J0qwPXGb lR4Q== X-Gm-Message-State: AA+aEWbKvyXFXImdc4FU0BiNzaUFfe3icx/LgcU8JqLtgocX4BGMSfLT HDN6GRcbMv37ZGTTnAPtSJTA0t5RFw3z6A== X-Received: by 2002:adf:ffca:: with SMTP id x10mr15380408wrs.289.1544553336479; Tue, 11 Dec 2018 10:35:36 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:35 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 19:35:14 +0100 Message-Id: <20181211183514.20948-12-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 11/11] Silicon/AMD/Styx/AcpiPlatformDxe: disable KCS on pre-B1 silicon 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: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Align the ACPI platform driver with the DT patching code, which only enables the IPMI/KCS device node on B1 silicon (or later). Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c index 9b1428fc00eb..259a708b7c2c 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -172,7 +172,8 @@ InstallSystemDescriptionTables ( break; case SIGNATURE_64 ('S', 't', 'y', 'x', 'K', 'c', 's', ' '): - if (!FixedPcdGetBool (PcdEnableKcs)) { + if (!FixedPcdGetBool (PcdEnableKcs) || + (CpuId & STYX_SOC_VERSION_MASK) < STYX_SOC_VERSION_B1) { continue; }