From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 85A0A2243693A for ; Sat, 24 Feb 2018 06:19:27 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id s5so16839723wra.0 for ; Sat, 24 Feb 2018 06:25: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; bh=aZalxFCT2VwIDvIicMW/BWrP+B0jrz3iFI00EnicRDs=; b=abmY0jXUucOMcrsHJeYSIA0ZyOkP0ZXeVuv+yPSTKmEJF2n+lRRfk5ygBibak/0db6 BMV6pq9YHEiVzpgXh7KjGPkRiTgtb6+xufRr5iSx2CM8bY7tSaVTW60SbezcpdUMD2jI XDUAv/zvjcXKvxfnp2yAB1T+75s5NZ0N55tJo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aZalxFCT2VwIDvIicMW/BWrP+B0jrz3iFI00EnicRDs=; b=Ah+4Ntghvsi9g1JXt7vm3YWrigNap0WWWUhCbb6gYh4fR1cRGRgHelX8S1G48jvfgR 19h31/9bCKiMt9LWtN2ujthHVz2RSgcU3UHCn8iQ+cFKfNIayZsFm8VPXt/ueJNKUMlz ZImcXLJ7m4elAoF8Xo5+KLKQfrO0r+F5beugrLqfh8pFUa/NTDCEUb+9qlIbhdVNaZqS MygLI21JWD/1/apnmZRYRQnKqntIM4/WjObKsUalItjhLwGzv6OKF+VmRxi8uh2PV0Lo 1Bdj0o7+STzdoNnz1m11f6wyQ3NboF/F0tQ93UM9A8Z5KUV6SIrAIlyZOPw8Ytqg/eAx JyiA== X-Gm-Message-State: APf1xPAbhBfZHbmbO7RXuigkfvEsM1GsPqwQQhlsLiCfLaFF0U07aVFv BEQfti/fjolnn7PXjcGiVeXxcyCWxdA= X-Google-Smtp-Source: AH8x224IjmW3NyA93sEYPpbdx1ApwZab1PBsnqhAQFLayKV6AuXYJ7+Axq2xc0IPPHlZ2Iv8/TQ6sQ== X-Received: by 10.223.138.251 with SMTP id z56mr4583781wrz.196.1519482328824; Sat, 24 Feb 2018 06:25:28 -0800 (PST) Received: from localhost.localdomain ([160.162.31.62]) by smtp.gmail.com with ESMTPSA id a14sm4612944wrf.22.2018.02.24.06.25.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2018 06:25:28 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, lersek@redhat.com, Ard Biesheuvel Date: Sat, 24 Feb 2018 14:25:15 +0000 Message-Id: <20180224142515.461-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180224142515.461-1-ard.biesheuvel@linaro.org> References: <20180224142515.461-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms 2/2] Silicon/SynQuacerI2cDxe: remove special runtime treatment of DEBUG()s X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Feb 2018 14:19:28 -0000 It is no longer necessary to inhibit DEBUG() calls at runtime, due to the fact that we switched to a DebugLib implementation that takes care of this. Since a platform could theoretically wire up DXE_RUNTIME_DRIVER modules to a DebugLib/SerialPortLib implementation combo that does remap the UART MMIO region for runtime and produces UEFI debug output on a UART that is not owned by the OS, it is better not to handle this in the driver directly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c index 5e70f9d921c3..415e3f0804ed 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c +++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c @@ -13,8 +13,6 @@ #include "SynQuacerI2cDxe.h" -#define BOOTTIME_DEBUG(x) do { if (!EfiAtRuntime()) DEBUG (x); } while (0) - // // We cannot use Stall () or timer events at runtime, so we need to busy-wait // for the controller to signal the completion interrupts. This value was @@ -168,27 +166,27 @@ SynQuacerI2cMasterStart ( MmioWrite8 (I2c->MmioBase + F_I2C_REG_DAR, SlaveAddress << 1); } - BOOTTIME_DEBUG ((DEBUG_INFO, "%a: slave:0x%02x\n", __FUNCTION__, + DEBUG ((DEBUG_INFO, "%a: slave:0x%02x\n", __FUNCTION__, SlaveAddress)); Bsr = MmioRead8 (I2c->MmioBase + F_I2C_REG_BSR); Bcr = MmioRead8 (I2c->MmioBase + F_I2C_REG_BCR); if ((Bsr & F_I2C_BSR_BB) && !(Bcr & F_I2C_BCR_MSS)) { - BOOTTIME_DEBUG ((DEBUG_INFO, "%a: bus is busy\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: bus is busy\n", __FUNCTION__)); return EFI_ALREADY_STARTED; } if (Bsr & F_I2C_BSR_BB) { // Bus is busy - BOOTTIME_DEBUG ((DEBUG_INFO, "%a: Continuous Start\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: Continuous Start\n", __FUNCTION__)); MmioWrite8 (I2c->MmioBase + F_I2C_REG_BCR, Bcr | F_I2C_BCR_SCC); } else { if (Bcr & F_I2C_BCR_MSS) { - BOOTTIME_DEBUG ((DEBUG_WARN, + DEBUG ((DEBUG_WARN, "%a: is not in master mode\n", __FUNCTION__)); return EFI_DEVICE_ERROR; } - BOOTTIME_DEBUG ((DEBUG_INFO, "%a: Start Condition\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: Start Condition\n", __FUNCTION__)); MmioWrite8 (I2c->MmioBase + F_I2C_REG_BCR, Bcr | F_I2C_BCR_MSS | F_I2C_BCR_INTE | F_I2C_BCR_BEIE); } @@ -329,13 +327,13 @@ SynQuacerI2cStartRequest ( Status = WaitForInterrupt (I2c); if (EFI_ERROR (Status)) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: Timeout waiting for interrupt - %r\n", + DEBUG ((DEBUG_WARN, "%a: Timeout waiting for interrupt - %r\n", __FUNCTION__, Status)); break; } if (MmioRead8 (I2c->MmioBase + F_I2C_REG_BSR) & F_I2C_BSR_LRB) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: No ack received\n", __FUNCTION__)); + DEBUG ((DEBUG_WARN, "%a: No ack received\n", __FUNCTION__)); Status = EFI_DEVICE_ERROR; break; } @@ -346,13 +344,13 @@ SynQuacerI2cStartRequest ( Bcr = MmioRead8 (I2c->MmioBase + F_I2C_REG_BCR); if (Bcr & F_I2C_BCR_BER) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: Bus error detected\n", __FUNCTION__)); + DEBUG ((DEBUG_WARN, "%a: Bus error detected\n", __FUNCTION__)); Status = EFI_DEVICE_ERROR; break; } if ((Bsr & F_I2C_BSR_AL) || !(Bcr & F_I2C_BCR_MSS)) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: Arbitration lost\n", __FUNCTION__)); + DEBUG ((DEBUG_WARN, "%a: Arbitration lost\n", __FUNCTION__)); Status = EFI_DEVICE_ERROR; break; } @@ -368,7 +366,7 @@ SynQuacerI2cStartRequest ( Status = WaitForInterrupt (I2c); if (EFI_ERROR (Status)) { - BOOTTIME_DEBUG ((DEBUG_WARN, + DEBUG ((DEBUG_WARN, "%a: Timeout waiting for interrupt - %r\n", __FUNCTION__, Status)); break; } @@ -383,13 +381,13 @@ SynQuacerI2cStartRequest ( Status = WaitForInterrupt (I2c); if (EFI_ERROR (Status)) { - BOOTTIME_DEBUG ((DEBUG_WARN, + DEBUG ((DEBUG_WARN, "%a: Timeout waiting for interrupt - %r\n", __FUNCTION__, Status)); break; } if (MmioRead8 (I2c->MmioBase + F_I2C_REG_BSR) & F_I2C_BSR_LRB) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: No ack received\n", __FUNCTION__)); + DEBUG ((DEBUG_WARN, "%a: No ack received\n", __FUNCTION__)); Status = EFI_DEVICE_ERROR; break; } @@ -486,7 +484,7 @@ SynQuacerI2cInit ( Dev->Resources[0].AddrLen, EFI_MEMORY_UC | EFI_MEMORY_RUNTIME); if (EFI_ERROR (Status)) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: failed to add memory space - %r\n", + DEBUG ((DEBUG_WARN, "%a: failed to add memory space - %r\n", __FUNCTION__, Status)); } -- 2.11.0