From patchwork Wed Jul 13 13:52:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Obuch X-Patchwork-Id: 1656046 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=codasip.com header.i=@codasip.com header.a=rsa-sha256 header.s=google header.b=wMUYwf+t; dkim-atps=neutral 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=) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LjfSt70GKz9s07 for ; Thu, 14 Jul 2022 00:02:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E544C83FF7; Wed, 13 Jul 2022 16:02:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=codasip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=codasip.com header.i=@codasip.com header.b="wMUYwf+t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6D6A83EDE; Wed, 13 Jul 2022 15:56:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E17FC83A22 for ; Wed, 13 Jul 2022 15:56:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=codasip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel.obuch@codasip.com Received: by mail-ed1-x532.google.com with SMTP id r18so14187141edb.9 for ; Wed, 13 Jul 2022 06:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codasip.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QhLk84wpdorHQMk+8nJGyclX4JdgC9C4sXCjoufglgI=; b=wMUYwf+tCjg5yYnZnwrIAgPFCw/Cc0VqxfIUCtO75HNmsHCaF1XHmkKHtBVrBgLRea WD86b06Gq95TkDZi6vja4ZrKBZkFwThMBBGIpluDR4Az0CTX0z0ad+xOjWLR+/EPALRC F7ZvhXbe10qqt0YUkP3/s2nDKgJrDE0LDfhrhqjQcgMHOe4F0Xx1AEgSRskwMLDceQxv wSqNJevrDJ/DPY7JSTwUtKppjaC96o7d38jBSiuAoJ/TkSf4dPE1nSGrQKI5Z70LIgNZ rZski60VEftkBIef2iuAyCLbe2rZ62JabwzH0FnqaXtQQe2UHd18IBpaBZL++Ig/VoGz cfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QhLk84wpdorHQMk+8nJGyclX4JdgC9C4sXCjoufglgI=; b=JmsaY1Cw1lMpvUgZkfADJt8orLysLJV7L4vi2+ARomHlRRUoB/9pKX7U1y1TjsMhNc uUBmu+4hxd5oOhAKisjvZ+hePyc1/qmZAJwu+YWvrCiXZWQua3hWE/y4yteS2Wnmxg/r XcYyNbotjmV8jI4+rDKoh9Inc9ul1D5aPG9ti7vIjsMONXx6vRqV14sjADL/fAQWKg/e 6oc73QEqJyQ89G6ZuaqiIvCfdhMrimVvwGQXIqbDB/apuP+iV9uRUbGREwo0garyjjWm A3LZlrsBtDXkjcRor+1tWGtVoU56YjjG7LQzMGi+9UYlHaNjLIqvpV6fjKzyOOdxgAwg aARw== X-Gm-Message-State: AJIora8EvWzcj8BJkpIMdMx651dzGNBHcE3zEewxKXGhJIPiDPV278W7 n7SdLdLJ68e9npomxLA74wijfHA2ySsc2w== X-Google-Smtp-Source: AGRyM1ve1ExK6PasZ+PcbPL/OLeM1YScTJyBEYmtA+d1RYkfbsW8XymNrK3jsgNi1NwoamIFnqqQZg== X-Received: by 2002:a05:6402:f10:b0:43a:b4cb:4d04 with SMTP id i16-20020a0564020f1000b0043ab4cb4d04mr5281077eda.305.1657720574315; Wed, 13 Jul 2022 06:56:14 -0700 (PDT) Received: from nb76.codasip.com ([193.85.186.210]) by smtp.gmail.com with ESMTPSA id h4-20020a50ed84000000b0043a85d7d15esm7907531edr.12.2022.07.13.06.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 06:56:13 -0700 (PDT) From: Samuel Obuch To: u-boot@lists.denx.de Cc: Samuel Obuch Subject: [PATCH 1/3] net: emaclite: fix broken build Date: Wed, 13 Jul 2022 15:52:02 +0200 Message-Id: <20220713135204.233268-2-samuel.obuch@codasip.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220713135204.233268-1-samuel.obuch@codasip.com> References: <20220713135204.233268-1-samuel.obuch@codasip.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 13 Jul 2022 16:02:04 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean Function ioremap_nocache seems to be defined only for mips and microblaze architectures. Therefore, the function call in the emaclite driver causes this driver to be unusable with other architectures, for example riscv. Signed-off-by: Samuel Obuch --- drivers/net/xilinx_emaclite.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 6c9f1f7c27..5cd88e04fe 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -615,8 +615,12 @@ static int emaclite_of_to_plat(struct udevice *dev) int offset = 0; pdata->iobase = dev_read_addr(dev); +#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_MIPS) emaclite->regs = (struct emaclite_regs *)ioremap_nocache(pdata->iobase, 0x10000); +#else + emaclite->regs = (struct emaclite_regs *)pdata->iobase; +#endif emaclite->phyaddr = -1; From patchwork Wed Jul 13 13:52:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Obuch X-Patchwork-Id: 1656047 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=codasip.com header.i=@codasip.com header.a=rsa-sha256 header.s=google header.b=LGolcJXS; dkim-atps=neutral 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=) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LjfT80w40z9s07 for ; Thu, 14 Jul 2022 00:02:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 613908400F; Wed, 13 Jul 2022 16:02:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=codasip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=codasip.com header.i=@codasip.com header.b="LGolcJXS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA05383A22; Wed, 13 Jul 2022 15:56:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 18BB8832DA for ; Wed, 13 Jul 2022 15:56:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=codasip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel.obuch@codasip.com Received: by mail-ed1-x536.google.com with SMTP id fd6so14198429edb.5 for ; Wed, 13 Jul 2022 06:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codasip.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0gpUBXSOzuCOwcanfrsq0BpoFK1svr1BYoj6Fweoo38=; b=LGolcJXSfV77XYiqTE2iFPcPlIJ3speVa6/awqgqFycPaI5MMaE4uJ4usq35Jq+tj+ 38j5KDkLGR9huOXEj1xvE+MtSlhzvUx5n5pYCVVwpUrdDUXURGUTa3C/SgSHvWXqQO9U wLH7abLkcAufbSIIAEf/tyPNx0SWXo90LSQnkgdE36ejG30db32obn/hYNXctkLiZxy9 DrrNRc38+C8YPl/UHWah77BMIrouJQmg6aaIRKrOiYeEUhfCQWdShZMJgZ9nsGCE/Wgx Wk8A96CJKgdLnk7wQMD4sokGEz2u9kF4RPv1ik67xCwmlewWw1+jglPBG3D0sceGuL2G 0y0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0gpUBXSOzuCOwcanfrsq0BpoFK1svr1BYoj6Fweoo38=; b=3bXh+cKRpeaLH9LbpT3DpzpivNLvNMudagPMLU2aQT/SjT7UGPmmQrNHL5Nk5+gsaa TrwbXKfkOsv6bYSYKMz9JtErHEDnVHmujO7aMwX8nI6sFPdXG85nhgVWQo4YNWSs10cG QWoZ5wxI/zXtodl4rdBLkpBlX6lphlrd4RIKcZ1fL3A9NnCCnEuxjOY41WP0xud0q1jZ M9axcueYoeW4Dr4/AXFl2SRTcUd4WIQSvNIYc76LHBQcYqqR5lfaXunLA6ioTIuIyvkN 1occfR2UnFOioIIGxsmPdIQw7ho++oxCI2PtKjmqtzwBW1s4doEICjb2IvN+3EgzN+Ix tiLw== X-Gm-Message-State: AJIora9aSePkQG5Izbn6DPfcDCjjZYUl+de6X2tR641mnfvkbGLfz99i O9Isuq4EGkatlpJfb0hMt4D/ipAF99mxBQ== X-Google-Smtp-Source: AGRyM1updmVobWBXf+M9VBeXuGrP3S9j0IlfABXGtiI4QGIZZ4F14yyEFjUr3oXMNU1onPQQymHwXQ== X-Received: by 2002:a05:6402:84d:b0:435:a764:9aad with SMTP id b13-20020a056402084d00b00435a7649aadmr5368700edz.332.1657720575395; Wed, 13 Jul 2022 06:56:15 -0700 (PDT) Received: from nb76.codasip.com ([193.85.186.210]) by smtp.gmail.com with ESMTPSA id h4-20020a50ed84000000b0043a85d7d15esm7907531edr.12.2022.07.13.06.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 06:56:14 -0700 (PDT) From: Samuel Obuch To: u-boot@lists.denx.de Cc: Samuel Obuch Subject: [PATCH 2/3] net: emaclite: fix xemaclite_alignedread/write functions Date: Wed, 13 Jul 2022 15:52:03 +0200 Message-Id: <20220713135204.233268-3-samuel.obuch@codasip.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220713135204.233268-1-samuel.obuch@codasip.com> References: <20220713135204.233268-1-samuel.obuch@codasip.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 13 Jul 2022 16:02:04 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean Use __raw_read* and __raw_write* functions to ensure read/write is passed to the memory-mapped regions, as non-volatile accesses may get optimised out. Signed-off-by: Samuel Obuch --- drivers/net/xilinx_emaclite.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 5cd88e04fe..de7a2dee0b 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -113,12 +113,12 @@ static void xemaclite_alignedread(u32 *srcptr, void *destptr, u32 bytecount) /* Word aligned buffer, no correction needed. */ to32ptr = (u32 *) destptr; while (bytecount > 3) { - *to32ptr++ = *from32ptr++; + *to32ptr++ = __raw_readl(from32ptr++); bytecount -= 4; } to8ptr = (u8 *) to32ptr; - alignbuffer = *from32ptr++; + alignbuffer = __raw_readl(from32ptr++); from8ptr = (u8 *) &alignbuffer; for (i = 0; i < bytecount; i++) @@ -136,8 +136,7 @@ static void xemaclite_alignedwrite(void *srcptr, u32 *destptr, u32 bytecount) from32ptr = (u32 *) srcptr; while (bytecount > 3) { - - *to32ptr++ = *from32ptr++; + __raw_writel(*from32ptr++, to32ptr++); bytecount -= 4; } @@ -148,7 +147,7 @@ static void xemaclite_alignedwrite(void *srcptr, u32 *destptr, u32 bytecount) for (i = 0; i < bytecount; i++) *to8ptr++ = *from8ptr++; - *to32ptr++ = alignbuffer; + __raw_writel(alignbuffer, to32ptr++); } static int wait_for_bit(const char *func, u32 *reg, const u32 mask, From patchwork Wed Jul 13 13:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Obuch X-Patchwork-Id: 1656048 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=codasip.com header.i=@codasip.com header.a=rsa-sha256 header.s=google header.b=EajMvxDo; dkim-atps=neutral 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=) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LjfTP4QPXz9s07 for ; Thu, 14 Jul 2022 00:02:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10DCD84015; Wed, 13 Jul 2022 16:02:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=codasip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=codasip.com header.i=@codasip.com header.b="EajMvxDo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0BC9C832DA; Wed, 13 Jul 2022 15:56:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6D61D83E4C for ; Wed, 13 Jul 2022 15:56:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=codasip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel.obuch@codasip.com Received: by mail-ej1-x62d.google.com with SMTP id l23so19995929ejr.5 for ; Wed, 13 Jul 2022 06:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codasip.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qfwtu9ssRSWD6AZPRhMCObeuCuffvArK+T0/bd/gt6Y=; b=EajMvxDohki8GLI/5ZdaL20gPL21hT5+X8YcxpmIiVFuQIrfH4LHyhWY9zIx02eX8l igtO3HRByHZqgHcqCXQbh7DTUu16cWL2M2NUJdv5+ZDXC9PiFIKKApNW+RBSp7M1rABy X1rTOf6N2qnM9NTCC7EpDmf6LuDQ3pjYE/Zn5Ir8Tbc4CD4Br1GuTF6nVDjNGFHQpyTy 26KIwNynCpYaMAEPrVDSGs2BzUDgP2drR3Yrq2peBA4Mm0IInE7ousoJM71ky4978Ibx s9NqulcaqwR0CNw7/tUI8uu8g6MXOoPuWVqnKoCtHKM1+yp6yv6s4+9PbbVMtATobuRH /D6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qfwtu9ssRSWD6AZPRhMCObeuCuffvArK+T0/bd/gt6Y=; b=muFUUH/+NML33kzT+jai1D71E2UC7q7xo21DWivE2jqMvWq2PKeMIaPEgPN0GsrYMY 4gfHijrNjVJHmtlUE8w0D3NxtTEJ5Ih6igrocHiokWl53lYNimYHrRP5qGzQ5JNYIDpC Mb9+jcfuzPF0tP5qO9nNOyjcetWX7QvPot/0VkXyk4EqNO7Z6dP7FFgxlTWkK3CBHdy9 Z48CiV2fDHtokHpwZ5Eh9ew+KWibn+wJdIrv21/nqcxKXQMxcRUsDgrfeBUbfTRPwwpe S7xbiQbk6rZEqaDOKy192jJ40xe6aar/fdFvOCEvApyicO42uXofSgZcZ9HBP/JJogP4 qh7Q== X-Gm-Message-State: AJIora8F7OfEWLv8qO5nUUv8Qg/51gGE6ycUNsZuL6B+sJVoKw8AjTYl 63m6XwFZ5RGEGOZt3N53I/G4iUuMoU+4Iw== X-Google-Smtp-Source: AGRyM1vETseZReWtQRNx4QgN/R9/bc/+bXSCVRZKPcD9rw4j04CKkZmsIU2+EAKzChGCNLV6RBbejw== X-Received: by 2002:a17:907:2887:b0:72b:68ce:2fff with SMTP id em7-20020a170907288700b0072b68ce2fffmr3616896ejc.423.1657720576700; Wed, 13 Jul 2022 06:56:16 -0700 (PDT) Received: from nb76.codasip.com ([193.85.186.210]) by smtp.gmail.com with ESMTPSA id h4-20020a50ed84000000b0043a85d7d15esm7907531edr.12.2022.07.13.06.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 06:56:15 -0700 (PDT) From: Samuel Obuch To: u-boot@lists.denx.de Cc: Samuel Obuch Subject: [PATCH 3/3] net: emaclite: fix handling for IP packets with specific lengths Date: Wed, 13 Jul 2022 15:52:04 +0200 Message-Id: <20220713135204.233268-4-samuel.obuch@codasip.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220713135204.233268-1-samuel.obuch@codasip.com> References: <20220713135204.233268-1-samuel.obuch@codasip.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 13 Jul 2022 16:02:04 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean The maximum length is capped similarly to the emaclite_send function. Avoid integer underflow for values of ip->ip_len < 30, the minimum length of an IP packet is 21 bytes. Signed-off-by: Samuel Obuch Reviewed-by: Michal Simek --- drivers/net/xilinx_emaclite.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index de7a2dee0b..21c450ec46 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -518,6 +518,8 @@ try_again: length = ntohs(ip->ip_len); length += ETHER_HDR_SIZE + ETH_FCS_LEN; debug("IP Packet %x\n", length); + if (length > PKTSIZE) + length = PKTSIZE; break; default: debug("Other Packet\n"); @@ -526,7 +528,7 @@ try_again: } /* Read the rest of the packet which is longer then first read */ - if (length != first_read) + if (length > first_read) xemaclite_alignedread(addr + first_read, etherrxbuff + first_read, length - first_read);