From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web11.5828.1582711450753344352 for ; Wed, 26 Feb 2020 02:04:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=xulIVn4V; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f68.google.com with SMTP id p18so2158331wre.9 for ; Wed, 26 Feb 2020 02:04:10 -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=H5AVNVlGgq36EKmWUxfm1j49MLx84IGVvSp54z2E9nE=; b=xulIVn4V2DsfNe10Vtge9MjAxCGAlmaYd8gxi6c84QQizdtAVSgrpB1YnXXH6nGExY dOV3b8VyNUXJIhRtjNjv5k9gSquQbAi6SGrZKeB6RluoQLlF6LQVYQuocGuwPQVWx5MA jEChiCsUIlzgtyklhM0ziBlbqBuKjkxfjd356uE+zMqfYCDUyGjLe0K9czqGcjUOCOJo 8cwLZ/iAKfR/wtiexonCMlEbnoKGn/1aeXBH4YMKvL6IDg0WX33Crz0VubRhbHehxeYu /c4qNp7O6ewzyG3JRW+tgChxH+iPL5o08dTRgQyz8n6U7D8C7u6BXIeUsOq9rx0+yg2I dOtQ== 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=H5AVNVlGgq36EKmWUxfm1j49MLx84IGVvSp54z2E9nE=; b=ZG7jGkpM2JAUd5fLunQ59YkaJJ70qVF5p5ZjX2MmNr4H0LUdLzVvhv35SDNTd8c/zG 5wrijphdfYsKzIUlkZkZZI5q2fm7dgJw+fKhY3FqE4LqEouEfJWbUmnpUXFZ/Pcw4RwE 1BYpTgyzvDA/7tb3RFdcoZInWmdhXHPW+Rttv4poPjwwGdW2FkRTVk6Tkik/gvP2OjBZ pFHeSAVmXqWSuXsx/GK9si6cfCPfV9cpgxIbkXkH4VeStQpxSQEUQAVzLp5cEaHU24ZN X0Zsl8qeZqawcUO9VDKWVQuXZ07AwyvKOeeXN/zJIZ8Q6tAzly8IRaOzRnXkSdTrIk0z coaQ== X-Gm-Message-State: APjAAAXiN3KMLgO71d85Jzi6l89NW2hMuGv257zACipVUh/eHXl6F1Ej fnZrKlZQywAic0m2ld2vBtKFDp6Ipx9g7A== X-Google-Smtp-Source: APXvYqyqBzmZDmt60C4I7uGzvCEoHglildL8npGIOdfLIyf54CMApEXURNXoLdd/P8LroRki5f7EZw== X-Received: by 2002:adf:f244:: with SMTP id b4mr4637677wrp.413.1582711448991; Wed, 26 Feb 2020 02:04:08 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id b10sm2559159wrw.61.2020.02.26.02.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 02:04:07 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, lersek@redhat.com, sami.mujawar@arm.com, Ard Biesheuvel Subject: [PATCH 5/6] ArmPkg/ArmLib: move set/way helper functions into private header Date: Wed, 26 Feb 2020 11:03:52 +0100 Message-Id: <20200226100353.31962-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200226100353.31962-1-ard.biesheuvel@linaro.org> References: <20200226100353.31962-1-ard.biesheuvel@linaro.org> The clean/invalidate helper functions that operate on a single cache line identified by set, way and level in a special, architected format are only used by the implementations of the clean/invalidate routines that operate on the entire cache hierarchy, as exposed by ArmLib. The latter routines will be deprecated soon, so move the helpers out of ArmLib.h and into a private header so they are safe from abuse. Signed-off-by: Ard Biesheuvel --- ArmPkg/Include/Library/ArmLib.h | 18 ------------------ ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h | 18 ++++++++++++++++++ ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h index e76a46d5f4ce..5a27b7c2fc27 100644 --- a/ArmPkg/Include/Library/ArmLib.h +++ b/ArmPkg/Include/Library/ArmLib.h @@ -211,24 +211,6 @@ ArmCleanInvalidateDataCacheEntryByMVA ( IN UINTN Address ); -VOID -EFIAPI -ArmInvalidateDataCacheEntryBySetWay ( - IN UINTN SetWayFormat - ); - -VOID -EFIAPI -ArmCleanDataCacheEntryBySetWay ( - IN UINTN SetWayFormat - ); - -VOID -EFIAPI -ArmCleanInvalidateDataCacheEntryBySetWay ( - IN UINTN SetWayFormat - ); - VOID EFIAPI ArmEnableDataCache ( diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h index ab9bcf553c4d..b2c8a8ea0b84 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h @@ -17,5 +17,23 @@ AArch64AllDataCachesOperation ( IN AARCH64_CACHE_OPERATION DataCacheOperation ); +VOID +EFIAPI +ArmInvalidateDataCacheEntryBySetWay ( + IN UINTN SetWayFormat + ); + +VOID +EFIAPI +ArmCleanDataCacheEntryBySetWay ( + IN UINTN SetWayFormat + ); + +VOID +EFIAPI +ArmCleanInvalidateDataCacheEntryBySetWay ( + IN UINTN SetWayFormat + ); + #endif // __AARCH64_LIB_H__ diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h index c52fb9a1b484..93183e67230e 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h @@ -30,5 +30,23 @@ ArmV7AllDataCachesOperation ( IN ARM_V7_CACHE_OPERATION DataCacheOperation ); +VOID +EFIAPI +ArmInvalidateDataCacheEntryBySetWay ( + IN UINTN SetWayFormat + ); + +VOID +EFIAPI +ArmCleanDataCacheEntryBySetWay ( + IN UINTN SetWayFormat + ); + +VOID +EFIAPI +ArmCleanInvalidateDataCacheEntryBySetWay ( + IN UINTN SetWayFormat + ); + #endif // __ARM_V7_LIB_H__ -- 2.17.1