From patchwork Mon Jan 4 07:02:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1422001 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=bz+Hlrc6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8RSC4c47z9sVR for ; Mon, 4 Jan 2021 18:03:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E14B82653; Mon, 4 Jan 2021 08:03:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="bz+Hlrc6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CBE28262D; Mon, 4 Jan 2021 08:03:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6BB7D8232D for ; Mon, 4 Jan 2021 08:03:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1609743788; bh=/dgMJc8vCs39OuxxYmjL0XoojBbp5zr+2xrV5WlgHIU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bz+Hlrc6j5EoQ1es1TjtPjNc63St4TL+tOyxL3urCuL8qLjlpUHstIX53dVHxikgY +j1QhYGZjBCfQVPXE95ZF+1dJBSyg1McQL4RrLHJ0n2ns0YrVo6mAAi+D58i74VAGG QVbYTnsht/cXCXQgDrmDjvOSwkA/JM44rb7ykpZE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1McYCb-1kQXqL2ODN-00d27d; Mon, 04 Jan 2021 08:03:08 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Lokesh Vutla , Bin Meng , Vignesh Raghavendra , Grygorii Strashko , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/5] ram: k3-j721e: rename BIT_MASK() Date: Mon, 4 Jan 2021 08:02:52 +0100 Message-Id: <20210104070256.260002-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210104070256.260002-1-xypron.glpk@gmx.de> References: <20210104070256.260002-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:cm8r2FseohSGhAeaWHee/mvl0ZeagPFD+D1dIWKBO890A1Lo2J/ 50OIvP+fI3a9jlPWYVjb2iXKUSao9o8mJD8bxwcscGT9DPNrERoDDqCKbonyE0iHq/45l57 58k6/Az+rJuRwcGvnZtsqklP/FHBipzmXWR+ZG/jTXdD2oTqAJu4x/RahaDR1OZBOie1+nb nI870F/KOYaHKm201AzPQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:JUAG6cuP53I=:1o+lmiC0kTi6eyoyL6XXgh UdqNoAU9U/6XpCG6aChObg9kuTAZef1ASH6UaVb0i9+jmFcPt9yCbDxh2XdEws19c3iMwEEE3 FjXS3Oe3gIyOTPSemj+eaNBi4fMgvKsiThpm4movoVdoPQ1yN2K4wEFdMF6hgeVsoo+pyNFPF 48uzWsiqLDBy2wb+/rBi++Kbs95tHiSvF+6CqAsIntR5BSe50WtThX+VvUzwTmF9RebnFbDgf bRAoa5be1+0dPTkxxs7Q0YdUZe4DtEq7HBq+7yvix2aZ9ufOt3KhOD8C0ZgHMFy8CNTOGQoyN fU6U2rwr0SKAeTYj3JTRRAAxUjE/cnz684bm1Tblj0zha3ZfSY+BGRfyfLzPm53h8Yy/H3Amu R1BbT5zfN32s/9Z1ZZbb5fMK13Cu0sW+r7WAxYpZjyn6HuaqnPoOP0XK4p1hulUUOlHnVt021 r8SvoNSPl28IeRF4yOeRFvGbQY8NXTHKuVO3QZ2IvWssjr9G16lRK10+uYa4m3JB0/f2fr2+S keMeN0MaWMTF6bftqY7RjzL/YqA8hcgFSpRUUonpTijt3hf1OlQJMRECAQWop9egc8j1Vd3HN 0gDtuYHZfzfbNA1mFfzwoe3CuBKAOXwaUrsyKKPCsw6hA+RWJeq5YE+IG0xtS/HFrzNCzFRCP jH3xcfbcRYsjdByAwC1kKCAcjd2yNvkxi7S1kCSFZbD7qQSQdaOVSMkFjhBJh0QV/6xTbRNUZ PWS5dlojtDZVkibVU72L4FwgdKHpZoAOOP7D6TzasR7l92mRT/VHxSCu1aGpV/KNYYpe7BGvT xUrXWTf3dtSiZrBAmz0UCpKSVpn/6iVOIxKjnYdJSF2Lqc0C5OuZFtj3uonaS7pnj3g2gH6ym 62ZaQQt9pv9K1LtPCCew== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean The macro BIT_MASK is already defined in include/linux/bitops.h. To avoid name collisions rename BIT_MASK() in drivers/ram/k3-j721e/lpddr4_private.h to LPDDR4_BIT_MASK(). Remove superfluous parantheses. Remove superfluous comparison to 0. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- drivers/ram/k3-j721e/lpddr4.c | 14 +++++++------- drivers/ram/k3-j721e/lpddr4_private.h | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) -- 2.29.2 diff --git a/drivers/ram/k3-j721e/lpddr4.c b/drivers/ram/k3-j721e/lpddr4.c index fc80fb1e2c..68043d7cb6 100644 --- a/drivers/ram/k3-j721e/lpddr4.c +++ b/drivers/ram/k3-j721e/lpddr4.c @@ -719,7 +719,7 @@ uint32_t lpddr4_checkctlinterrupt(const lpddr4_privatedata * pd, /* MISRA compliance (Shifting operation) check */ if (fieldshift < WORD_SHIFT) { - if (((ctlirqstatus >> fieldshift) & BIT_MASK) > 0U) { + if ((ctlirqstatus >> fieldshift) & LPDDR4_BIT_MASK) { *irqstatus = true; } else { *irqstatus = false; @@ -746,11 +746,11 @@ uint32_t lpddr4_ackctlinterrupt(const lpddr4_privatedata * pd, if (localinterrupt > WORD_SHIFT) { localinterrupt = (localinterrupt - (uint32_t) WORD_SHIFT); - regval = ((uint32_t) BIT_MASK << localinterrupt); + regval = (uint32_t)LPDDR4_BIT_MASK << localinterrupt; CPS_REG_WRITE(&(ctlregbase->LPDDR4__INT_ACK_1__REG), regval); } else { - regval = ((uint32_t) BIT_MASK << localinterrupt); + regval = (uint32_t)LPDDR4_BIT_MASK << localinterrupt; CPS_REG_WRITE(&(ctlregbase->LPDDR4__INT_ACK_0__REG), regval); } @@ -823,7 +823,7 @@ uint32_t lpddr4_checkphyindepinterrupt(const lpddr4_privatedata * pd, phyindepirqstatus = CPS_REG_READ(&(ctlregbase->LPDDR4__PI_INT_STATUS__REG)); *irqstatus = - (((phyindepirqstatus >> (uint32_t) intr) & BIT_MASK) > 0U); + !!((phyindepirqstatus >> (uint32_t)intr) & LPDDR4_BIT_MASK); } return result; } @@ -841,7 +841,7 @@ uint32_t lpddr4_ackphyindepinterrupt(const lpddr4_privatedata * pd, lpddr4_ctlregs *ctlregbase = (lpddr4_ctlregs *) pd->ctlbase; /* Write 1 to the requested bit to ACk the interrupt */ - regval = ((uint32_t) BIT_MASK << ui32shiftinterrupt); + regval = (uint32_t)LPDDR4_BIT_MASK << ui32shiftinterrupt; CPS_REG_WRITE(&(ctlregbase->LPDDR4__PI_INT_ACK__REG), regval); } @@ -894,7 +894,7 @@ static void lpddr4_checkwrlvlerror(lpddr4_ctlregs * ctlregbase, (volatile uint32_t *)(&(ctlregbase->LPDDR4__PHY_WRLVL_ERROR_OBS_0__REG)); /* PHY_WRLVL_ERROR_OBS_X[1:0] should be zero */ - errbitmask = (BIT_MASK << 1) | (BIT_MASK); + errbitmask = (LPDDR4_BIT_MASK << 1) | LPDDR4_BIT_MASK; for (snum = 0U; snum < DSLICE_NUM; snum++) { regval = CPS_REG_READ(regaddress); if ((regval & errbitmask) != 0U) { @@ -1054,7 +1054,7 @@ static void lpddr4_seterrors(lpddr4_ctlregs * ctlregbase, lpddr4_debuginfo * debuginfo, bool * errfoundptr) { - uint32_t errbitmask = (BIT_MASK << 0x1U) | (BIT_MASK); + uint32_t errbitmask = (LPDDR4_BIT_MASK << 0x1U) | LPDDR4_BIT_MASK; /* Check PLL observation registers for PLL lock errors */ debuginfo->pllerror = diff --git a/drivers/ram/k3-j721e/lpddr4_private.h b/drivers/ram/k3-j721e/lpddr4_private.h index 42c923464a..3d5017ea47 100644 --- a/drivers/ram/k3-j721e/lpddr4_private.h +++ b/drivers/ram/k3-j721e/lpddr4_private.h @@ -14,9 +14,9 @@ #define VERSION_0 (0x54d5da40U) #define VERSION_1 (0xc1865a1U) -#define BIT_MASK (0x1U) -#define BYTE_MASK (0xffU) -#define NIBBLE_MASK (0xfU) +#define LPDDR4_BIT_MASK (0x1U) +#define BYTE_MASK (0xffU) +#define NIBBLE_MASK (0xfU) #define WORD_SHIFT (32U) #define WORD_MASK (0xffffffffU) @@ -46,11 +46,15 @@ #define IO_CALIB_DONE ((uint32_t)0x1U << 23U) #define IO_CALIB_FIELD ((uint32_t)NIBBLE_MASK << 28U) #define IO_CALIB_STATE ((uint32_t)0xBU << 28U) -#define RX_CAL_DONE ((uint32_t)BIT_MASK << 4U) -#define CA_TRAIN_RL (((uint32_t)BIT_MASK << 5U) | ((uint32_t)BIT_MASK << 4U)) +#define RX_CAL_DONE ((uint32_t)LPDDR4_BIT_MASK << 4U) +#define CA_TRAIN_RL (((uint32_t)LPDDR4_BIT_MASK << 5U) | \ + ((uint32_t)LPDDR4_BIT_MASK << 4U)) #define WR_LVL_STATE (((uint32_t)NIBBLE_MASK) << 13U) -#define GATE_LVL_ERROR_FIELDS (((uint32_t)BIT_MASK << 7U) | ((uint32_t)BIT_MASK << 6U)) -#define READ_LVL_ERROR_FIELDS ((((uint32_t)NIBBLE_MASK) << 28U) | (((uint32_t)BYTE_MASK) << 16U)) -#define DQ_LVL_STATUS (((uint32_t)BIT_MASK << 26U) | (((uint32_t)BYTE_MASK) << 18U)) +#define GATE_LVL_ERROR_FIELDS (((uint32_t)LPDDR4_BIT_MASK << 7U) | \ + ((uint32_t)LPDDR4_BIT_MASK << 6U)) +#define READ_LVL_ERROR_FIELDS ((((uint32_t)NIBBLE_MASK) << 28U) | \ + (((uint32_t)BYTE_MASK) << 16U)) +#define DQ_LVL_STATUS (((uint32_t)LPDDR4_BIT_MASK << 26U) | \ + (((uint32_t)BYTE_MASK) << 18U)) #endif /* LPDDR4_PRIV_H */ From patchwork Mon Jan 4 07:02:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1422000 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=PwYH4ZJE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8RS211Lgz9sRR for ; Mon, 4 Jan 2021 18:03:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D7FC282409; Mon, 4 Jan 2021 08:03:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="PwYH4ZJE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 819CD82644; Mon, 4 Jan 2021 08:03:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A94238239D for ; Mon, 4 Jan 2021 08:03:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1609743789; bh=no15MOLsm9yWXJOo9ejYQVq9obKgh511Lkai1xtPsLs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PwYH4ZJETcSbVXNYShBhsjmsSwjaPTvbujvsJxfD/im3SYV0jFxKYoRkSn6amaUit OnnhcktnTqN9oNBGGSnj1/jMaS9n0y6GPSiEwCqTPCo295qUqN+2M/XGY9hyaJqz/G bjKf12Kq20tv0rWl4jUeXFPWj0xTVW1uP9SP3u2c= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mlw7f-1kDsOF3sOJ-00j3ix; Mon, 04 Jan 2021 08:03:09 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Lokesh Vutla , Bin Meng , Vignesh Raghavendra , Grygorii Strashko , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 2/5] log: make debug_cond() function like Date: Mon, 4 Jan 2021 08:02:53 +0100 Message-Id: <20210104070256.260002-3-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210104070256.260002-1-xypron.glpk@gmx.de> References: <20210104070256.260002-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YxaaQTQwvlymVc+G2/iwkKBUN442Tbr+o/hu9V7sj+6otAcATNv PveMg91WPDsJ7QCsrxBd5wQDEnhiMNvBBemPy92rcn0n4Rz1Y7LNq0RZxEU5x1gcSK057D0 fBnysBteYue4Sfa+A9el+98PNMJCNNdkolmZknuGXswP8FSJ3e0XfJYuo494BPKVXdwWi9O yQekBvafiFc3ydwQDSuXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:5S3NQUCpWNc=:eYad9kosUSX+ELDqHus30p 5RD7q7cOZxVp0h5xuaz4DjThnI/vnl6TSR0orl5Es/EMVq7ubNKZwyOv6B783fZ5gaS+RL3sH eydJcYi9rBcGxwH2upFbpEBomhFBYBkkmgDQj+xdhw6oIsYNESPRFBdO2hl7LizAtFgwBDHbg gDwq2mQO0r+mBx8Y6LSbaZFqx/G1s+6RbZANg8V36n96eCyWHL1AwmLOnR2yXoDMSwKi4ENjP aLKHPnFPi0K94Z3zAagSaAB3ECKrRCmsvSPeSpHcxXT5dOfe5jU0nkEZm+b01kjrBlKpgaL3X 7LuKgIY/8rfii0Ry8B23greCshIjAycn56fwtBfj1rFiWmwi/2/myMvUuOUABQcKOdhBYF8NE QwEAwlS+inJXQTPlbGV3OUTHlI81f71risvDB9DgCazZiTeYOpJuUt6yyZWh2nmu5+ygZE2HW HfHT0+kvCqchko+5bWj/DOlpVrhS1zyTMFvRFSiicM5QfDX+HPg3mDhGoM8j9zOs1WPsvUQMp lmcEz/g+5EJlorWv1/jfYxVJURAaO6ys4Osp4ZS8GAPACh1cQ43uMeEUDDI82fdvUgjCtr4gY Ur/KuAX734d3m+qIYyt+JD28eS6/2FN+hDgrmO0A2kPWf3Dj9PcjIEqDSPe+FrYLkTwVpFeSR cSDcwZb+DtwBGZJMeqpCHmQsn5dLdmMD5LIRUsP24w3kp96X0/d8c4oZshdPigyxj5SPLNSva JgD9czAOJWyjNeNKKEhsYuxkz49pEcraQGmuRsV5c7mPsbF3j3n3IFlWtwkAjMh6xxQQuH63J Kyco8SOQn5ZHrCnuYCe7oCoER/VqHp13CeQFZv2G0MN9RKRCtMkciH1rTwjF0P7IF+tF+zuAL ZCOOkUhqGFQ2Pm2BVKOQ== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Change debug_cond() such that it can be used instead of a function like debug(). Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/log.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.29.2 diff --git a/include/log.h b/include/log.h index 29f18a82dc..34cea802a1 100644 --- a/include/log.h +++ b/include/log.h @@ -217,10 +217,9 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level, #if !_DEBUG && CONFIG_IS_ENABLED(LOG) #define debug_cond(cond, fmt, args...) \ - do { \ - if (1) \ - log(LOG_CATEGORY, LOGL_DEBUG, fmt, ##args); \ - } while (0) +({ \ + log(LOG_CATEGORY, LOGL_DEBUG, fmt, ##args); \ +}) #else /* _DEBUG */ @@ -229,11 +228,11 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level, * computed by a preprocessor in the best case, allowing for the best * optimization. */ -#define debug_cond(cond, fmt, args...) \ - do { \ - if (cond) \ - printf(pr_fmt(fmt), ##args); \ - } while (0) +#define debug_cond(cond, fmt, args...) \ +({ \ + if (cond) \ + printf(pr_fmt(fmt), ##args); \ +}) #endif /* _DEBUG */ From patchwork Mon Jan 4 07:02:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1422003 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=XYkgezS/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8RSb5T8kz9sVR for ; Mon, 4 Jan 2021 18:04:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A813682663; Mon, 4 Jan 2021 08:03:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="XYkgezS/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C56E282409; Mon, 4 Jan 2021 08:03:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C733B823D3 for ; Mon, 4 Jan 2021 08:03:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1609743789; bh=alckZXykoExOCBr4Rgs+6I2cSW0cgrXVurlIYY1c+ds=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XYkgezS/9tmvQ3soVqj5pl3KqrLuWjTQ8+y8LzgJ3P/Brbxj8qCYR1mhPqe9hbz1c LqUEBR7yD7kkT0xGolkqfwDiZaI0t0WjVJJAyaFroA3XjJw1xwmE21Pd6NFgNWBqJe tZtJblPCQxp6QWGab5ZZ5Iu/++TlRP0XIGecvO1s= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N6bfq-1juwUt1DSA-017z0E; Mon, 04 Jan 2021 08:03:09 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Lokesh Vutla , Bin Meng , Vignesh Raghavendra , Grygorii Strashko , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 3/5] log: provide missing macros Date: Mon, 4 Jan 2021 08:02:54 +0100 Message-Id: <20210104070256.260002-4-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210104070256.260002-1-xypron.glpk@gmx.de> References: <20210104070256.260002-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:QwBjcrzMrjeZCeBsViSLLOZI2ShdMqu5Xfb3X+7CMMb8kPwZIKI cu1qR03yIK5b1SX5ugY5mt5It/gsWct2yj++qinV/ICXijyZsolPqK5VtkVxIeiq/wLEJQf sunlDzSONRzSqzk/sqS9ACjP/658JNa/gj1ZOiCEan19Gayu7lc/RfwZUyTKmqsktggBkH+ sMAC37a5otwGJjbqM2rag== X-UI-Out-Filterresults: notjunk:1;V03:K0:YCOYif6z6tU=:CUie5Iht0afM6/vCt7uM3a hlllJjOY5EGv20G4xRcsoSGNXNGMsWZ61B1HR8n40Th68L5jW4YqlcH6bNXtRUHJjh6YArp4C I6THafx2jJtZ/Z3W40CQsEXxKUr4NuJKnQvGm6Dn1Ahe3NNTpHtDZUdr+lWPikypPfR32qPmA ovcyfT6GDhB1QUif0MsLqzDHZw/UelMYT0DeG6sH3pcCSxcJ60u4z+IQGFAneXIhu6livPFx3 /hZ+Nakpm3T297ou1szkxTSDQvSwQMP3cLt/5laC7fGs6xlNT+aDE9vrWuSNo160EReKO67Iu 8AOuCC1ogTnHLjAF+wlTOyfI85MzH9acyZI7HdqgEGzZxAa6z0BnOaOI7Um2lH1Wa615HA6B6 s33ulA0crHSpvVSMe+xcWEDGWhFQFf6lBVHwDtKhUNlnbqnlIUxdZKGxccLsH6/ycWFV6IEB1 w64BB7IFDGtaRKsYU16u+GUsCSWrBqZ4nHaojLPes2AgnjZOrOUSNeoVIupv77onEsIQDwwTb v7B3EyrjxBSmIe8j5DkLGcYYMq5kcpugUXJzTnoGMBk1QBEi5wJYQBPPuh/8dKazpe1k54mFF I7eXyMawN0rFRKI6Wc9Zsu3vmDtBJ1q0G1H8R2e73M1PqX0UPP3XzI1uozwcHlWD7ZcPo6Tf5 WHiQHY6ZCz2OghxaKCQtIwWc9QbUEO4tdR1gXk6ms4xrAYS3KHDGwnLe5E+QH1BKYIB/j6Ccy Y+WuNHB8uDGqWMJ6ZjW2/0kYB54udmcxqLyT3mxtiQV4zbKi18odDnw5WRY/EMqdGBVJYbIGz pKSHbM2HO0HmPZ/2BQ7PA7FzIP0jy6fcZ/vNeUxgSeECvk5z1v2jUbZrYlavbsjWXf3yMCuc9 LWEd1GsaZNBOALxAyE7g== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean With commit d094a0734cee ("log: allow for message continuation") we have defined a special log level and category for message continuation. Let's have a macro for using these. If logging is enabled log_cont() will create a continuation log output with the same logging level and category as the previous message. If logging is not enabled, log_cont() will print like printf(). Provide macros for logging levels LOG_EMERG, LOG_ALERT, LOG_CRIT. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/log.h | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.29.2 diff --git a/include/log.h b/include/log.h index 34cea802a1..830707ef3d 100644 --- a/include/log.h +++ b/include/log.h @@ -156,6 +156,9 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level, */ #if CONFIG_IS_ENABLED(LOG) #define _LOG_MAX_LEVEL CONFIG_VAL(LOG_MAX_LEVEL) +#define log_emer(_fmt...) log(LOG_CATEGORY, LOGL_EMERG, ##_fmt) +#define log_alert(_fmt...) log(LOG_CATEGORY, LOGL_ALERT, ##_fmt) +#define log_crit(_fmt...) log(LOG_CATEGORY, LOGL_CRIT, ##_fmt) #define log_err(_fmt...) log(LOG_CATEGORY, LOGL_ERR, ##_fmt) #define log_warning(_fmt...) log(LOG_CATEGORY, LOGL_WARNING, ##_fmt) #define log_notice(_fmt...) log(LOG_CATEGORY, LOGL_NOTICE, ##_fmt) @@ -163,12 +166,17 @@ static inline int _log_nop(enum log_category_t cat, enum log_level_t level, #define log_debug(_fmt...) log(LOG_CATEGORY, LOGL_DEBUG, ##_fmt) #define log_content(_fmt...) log(LOG_CATEGORY, LOGL_DEBUG_CONTENT, ##_fmt) #define log_io(_fmt...) log(LOG_CATEGORY, LOGL_DEBUG_IO, ##_fmt) +#define log_cont(_fmt...) log(LOGC_CONT, LOGL_CONT, ##_fmt) #else #define _LOG_MAX_LEVEL LOGL_INFO +#define log_emerg(_fmt, ...) printf(_fmt, ##__VA_ARGS__) +#define log_alert(_fmt, ...) printf(_fmt, ##__VA_ARGS__) +#define log_crit(_fmt, ...) printf(_fmt, ##__VA_ARGS__) #define log_err(_fmt, ...) printf(_fmt, ##__VA_ARGS__) #define log_warning(_fmt, ...) printf(_fmt, ##__VA_ARGS__) #define log_notice(_fmt, ...) printf(_fmt, ##__VA_ARGS__) #define log_info(_fmt, ...) printf(_fmt, ##__VA_ARGS__) +#define log_cont(_fmt, ...) printf(_fmt, ##__VA_ARGS__) #define log_debug(_fmt, ...) debug(_fmt, ##__VA_ARGS__) #define log_content(_fmt...) log_nop(LOG_CATEGORY, \ LOGL_DEBUG_CONTENT, ##_fmt) From patchwork Mon Jan 4 07:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1422002 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=JL3LqBxx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D8RSP58bzz9sRR for ; Mon, 4 Jan 2021 18:04:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E53B48264D; Mon, 4 Jan 2021 08:03:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="JL3LqBxx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ECA3882645; Mon, 4 Jan 2021 08:03:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2C40C80404 for ; Mon, 4 Jan 2021 08:03:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1609743790; bh=XHZw87LMFC6VCz/y8vcOdppG2Kj4tkUpM91dHCALIso=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JL3LqBxx6x1mmrPSYKCOUktTMWinM7SgeCt3JLVKOmkSSJhXS5DGB0GfqQ9471PMw aNTzpLARbK5Wqz/7CGusOl5VK42wE77YTqfSZnnKzoQNOJhiuGHmDflCZpd9njMfYo sl81nC6+dhVPsd15LiyG5rN7sJvCawlSznS/Piko= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MxDkm-1k3EEo03WC-00xZgS; Mon, 04 Jan 2021 08:03:10 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Lokesh Vutla , Bin Meng , Vignesh Raghavendra , Grygorii Strashko , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 5/5] test: unit test for pr_err(), pr_cont() Date: Mon, 4 Jan 2021 08:02:56 +0100 Message-Id: <20210104070256.260002-6-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210104070256.260002-1-xypron.glpk@gmx.de> References: <20210104070256.260002-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:G2Fvwepq9mY5RIyGfbj6fEcuFB0HLCDx5pJdDQJb+bY12sfnASe 72UYYGmmLiUbD4Xo19IBRYpE/W4mq9TpK5ex3Nz0eaKZnw9aJJcvUYeEwKSKmqmVo9l7O+X F/ZU+Zi46hPt8rYASN5SPOKyGlunM3yx5uPNXnK3acYQ/r7cYc+O6LzE4kuRXwNdF3dOIo4 71/Bbzb1XV4ReyUhMEv3g== X-UI-Out-Filterresults: notjunk:1;V03:K0:xbAmtYjG+W0=:+JPw9spFymFNhp/SHQbcdO Gi4fj+IHiM9cw5PGm7BwMGvyq3BCSk3haIQZ2UzWUWjLDPmwxBoCXz3otyJJolSxBTjkH/8X6 WBFHlqbSkdrPs4HrlGKGSPydR2glP2seHOxyMrJxAjpp/ED6N9b6B3+cPd7XybDbllPy6MWqo 5ZqzUQniZvpVk/PFl87buQOa3VhbN8g8v3a7m+MgY7qiKYKO4H/Af9exe/NoH+8bGkcltm83o 9e9HolVPfX//6xzndgQLCtxnd9A0AY0kfOQnoIBT4trTSh33Zw87ui1v02AfK7NbqGhakQohF cJmqazFDkFJq0Yd+EVmlGcmy9tX4Qm48o7Xu+zh3woof664TbnNjkkX1ncMLrdBaNVVOQTo4v nR9IKjhbZxhn1Y14/P8A2O+tTQkNir0U3ykld5chm5mMnCYuN8H7qHdJwAV3o8c45F930sxHl sRnZBBeIhhFbT9mOBqDok7BRTU5rRMKMCfRdt2BuQb7xaUQQNzjRlxmUFz6rRq+Hnrow5dKsS XW0E//KVK0LF1qmemkBcwHWXsv5jYLNjVqUcfcRmEgoq8U+ACVlf8Pz88mnDls+/FUdAspntL pthmrMTEDyF8BERTD/E+17lbctfB9m2ppGqDskzElcWfkxv8t16KYlhSNERTkyk8e9Q28l2Q/ sZmZhyjEqvC0mJoRoVCIWMry730I4DbQuHeMHStm+Zsfbc2ttib5heQSxufKFkWuR6safxUBj Qo0EeHpl4wRe9lcdRssVKD8xju42oXYwWBAMtOUpKiIiYFmmbJOvwgWebqGRF4FPbMp0ANWoR RSc7kAcZdx5ZYSv0K/CHvcgLtTXT58uCNj82/yqVj2s2zWOQ3lylEzgKiCW4lejmxuey1Gbt6 o98tTkMzVuHkCf4rLQMA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Provide a unit test for printing via pr_err() and pr_cont(). Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- test/log/Makefile | 1 + test/log/pr_cont_test.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 test/log/pr_cont_test.c -- 2.29.2 diff --git a/test/log/Makefile b/test/log/Makefile index 88bc573e9f..afdafa502a 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_CMD_LOG) += log_filter.o ifdef CONFIG_UT_LOG obj-y += test-main.o +obj-y += pr_cont_test.o ifdef CONFIG_SANDBOX obj-$(CONFIG_LOG_SYSLOG) += syslog_test.o diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c new file mode 100644 index 0000000000..236eff4b33 --- /dev/null +++ b/test/log/pr_cont_test.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2021, Heinrich Schuchardt + * + * Test continuation of log messages using pr_cont(). + */ + +#include +#include +#include +#include +#include +#include +#include + +#define BUFFSIZE 64 + +#undef CONFIG_LOGLEVEL +#define CONFIG_LOGLEVEL 4 + +DECLARE_GLOBAL_DATA_PTR; + +static int log_test_pr_cont(struct unit_test_state *uts) +{ + int log_fmt; + int log_level; + + log_fmt = gd->log_fmt; + log_level = gd->default_log_level; + + /* Write two messages, the second continuing the first */ + gd->log_fmt = BIT(LOGF_MSG); + gd->default_log_level = LOGL_INFO; + console_record_reset_enable(); + pr_err("ea%d ", 1); + pr_cont("cc%d\n", 2); + gd->default_log_level = log_level; + gd->log_fmt = log_fmt; + gd->flags &= ~GD_FLG_RECORD; + ut_assertok(ut_check_console_line(uts, "ea1 cc2")); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} +LOG_TEST(log_test_pr_cont);