From patchwork Wed Jun 19 21:27:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1949853 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=OhEjUhG1; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4Gv850rtz20X8 for ; Thu, 20 Jun 2024 07:28:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B1D6884D4; Wed, 19 Jun 2024 23:28:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="OhEjUhG1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8AEF6884C7; Wed, 19 Jun 2024 23:28:08 +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-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) (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 6436C88363 for ; Wed, 19 Jun 2024 23:28:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ot1-x32a.google.com with SMTP id 46e09a7af769-6f9603730d5so101415a34.1 for ; Wed, 19 Jun 2024 14:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1718832485; x=1719437285; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uxeHz2raTD5KCK6hDmva5KcUg10JobBKvE2xiey8oCU=; b=OhEjUhG1h53xZO4HDem9t7yoQeyDahrUogVge6e0DwNKAKgg0jhPPusi1/PuyFpVbe 8FUUAuMo7C9pB848gCoZcInO6LBMy80fu96F+WGxOcXkl9AE7xBpoAZGDnCYzKpy8/gI OzxbaYBmaNcuU4CtJT3ey+sifr9e+3STmr32U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718832485; x=1719437285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uxeHz2raTD5KCK6hDmva5KcUg10JobBKvE2xiey8oCU=; b=M6NJLb4scjpHSNWlDMHRfkBDjEmN3w7jivlsMXzV+unWvVWtSTbrNFaQVvOlROO6G4 BUeKBbxczq+A51qk50S+pj40Hr0dLqDIC8vjOkp+WA3S6bmkIPBlzuirsFMPAMhpacEH dqCQXCmnbv6jvwvga4VblEX5uryjZ6FXHMXiRdn4gymWAcO5mnMUX91qKIUhkv4e0WFx mj8CMV585D/rF8DavKRnqGy24RqpKKqc0uHbIlQ/NDGv+FDiufTXZURNzTtYtCnZwlW8 V/irx3yL/s0MRcElR85KRFlfdpX3aTe4B9C35mHEyy5lGGU9QsNjM7D6m/ViqXovEWVm hNIA== X-Gm-Message-State: AOJu0YyT4U3na8DBufJtBL9D7wA8RJoWN1A/KibVTLctdUfgGDOOyY+4 A1Zzm5/ECntsLEW7sS6rg16YaJjnR+m9rio5uLfmTCmjykpSVR5ivPrlMGkSBjDFY+mPePbmoHk uWONGng== X-Google-Smtp-Source: AGHT+IFCuvhdEDNhhJkbdHBtaKHg7OoPlYl5hhPOvxmNGv3oJT/b+0HvVbt/XNAIiHHxv3WRWLAQtQ== X-Received: by 2002:a05:6830:1302:b0:6f9:a3c6:a864 with SMTP id 46e09a7af769-70073c2bfc9mr3887150a34.10.1718832485160; Wed, 19 Jun 2024 14:28:05 -0700 (PDT) Received: from bill-the-cat.tail58a08.ts.net (fixed-187-190-205-45.totalplay.net. [187.190.205.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7008a5a34c9sm338654a34.73.2024.06.19.14.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 14:28:04 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 2/7] m68k: Rename icache_invalid to invalidate_icache_all Date: Wed, 19 Jun 2024 15:27:54 -0600 Message-Id: <20240619212759.3456158-2-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619212759.3456158-1-trini@konsulko.com> References: <20240619212759.3456158-1-trini@konsulko.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean The implementation of icache_invalid appears to be doing what other architectures call invalidate_icache_all so rename to match. Signed-off-by: Tom Rini Reviewed-by: Ilias Apalodimas --- Huan Wang Angelo Dureghello --- arch/m68k/include/asm/cache.h | 1 - arch/m68k/lib/cache.c | 6 +++--- drivers/net/mcffec.c | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h index 6ef7f7be1af8..aa8d2edb40ba 100644 --- a/arch/m68k/include/asm/cache.h +++ b/arch/m68k/include/asm/cache.h @@ -185,7 +185,6 @@ #ifndef __ASSEMBLY__ /* put C only stuff in this section */ -void icache_invalid(void); void dcache_invalid(void); #endif diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c index dab834c1cbd8..370ad40f1423 100644 --- a/arch/m68k/lib/cache.c +++ b/arch/m68k/lib/cache.c @@ -29,7 +29,7 @@ int dcache_status(void) void icache_enable(void) { - icache_invalid(); + invalidate_icache_all(); *cf_icache_status = 1; @@ -53,7 +53,7 @@ void icache_disable(void) u32 temp = 0; *cf_icache_status = 0; - icache_invalid(); + invalidate_icache_all(); #if defined(CONFIG_CF_V4) || defined(CFG_CF_V4E) __asm__ __volatile__("movec %0, %%acr2"::"r"(temp)); @@ -68,7 +68,7 @@ void icache_disable(void) #endif } -void icache_invalid(void) +void invalidate_icache_all(void) { u32 temp; diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 04b711e4f650..7e53492733ed 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -399,7 +400,7 @@ static int mcffec_send(struct udevice *dev, void *packet, int length) #endif #ifdef CONFIG_SYS_UNIFY_CACHE - icache_invalid(); + invalidate_icache_all(); #endif j = 0; @@ -433,7 +434,7 @@ static int mcffec_recv(struct udevice *dev, int flags, uchar **packetp) for (;;) { #ifdef CONFIG_SYS_UNIFY_CACHE - icache_invalid(); + invalidate_icache_all(); #endif /* If nothing received - leave for() loop */ if (info->rxbd[info->rx_idx].cbd_sc & BD_ENET_RX_EMPTY)