nv-tegra-mirror/nvethernetrm
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/kernel/nvethernetrm.git synced 2025-12-22 09:12:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: Fix the incorrect code in CFLAGS

Browse Source 
Issue:
Few places incorrect CFLAGS are used.
OSD based flags cannot be used in OSI

Fix:
Move the code under correct CFLAGS
remove the OSD based codes

Note:
The OSD based logging need to be reimplemnedted
by  the macsec module.

Bug 3759976

Change-Id: I407b945a24028792f146bc08adf67428612978c3
Signed-off-by: Bibhay Ranjan <bibhayr@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/kernel/nvethernetrm/+/2811917
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Bibhay Ranjan
2022-11-18 19:42:54 +05:30
committed by Bhadram Varka
parent 5a50d75a13
commit 424f7987df
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osi_macsec.h
View File

@@ -116,7 +116,7 @@
#define OSI_SA_LUT_MAX_INDEX OSI_TABLE_INDEX_MAX #define OSI_SA_LUT_MAX_INDEX OSI_TABLE_INDEX_MAX
/** @} */ /** @} */
#ifndef OSI_STRIPPED_LIB #ifdef DEBUG_MACSEC
/** /**
* @addtogroup Debug buffer table CONFIG register helpers macros * @addtogroup Debug buffer table CONFIG register helpers macros
* *
@@ -141,7 +141,7 @@
#define OSI_RX_DBG_ICV_ERROR_EVT OSI_BIT(10) #define OSI_RX_DBG_ICV_ERROR_EVT OSI_BIT(10)
#define OSI_RX_DBG_CAPTURE_EVT OSI_BIT(11) #define OSI_RX_DBG_CAPTURE_EVT OSI_BIT(11)
/** @} */ /** @} */
#endif /* !OSI_STRIPPED_LIB */ #endif /* DEBUG_MACSEC*/
/** /**
* @addtogroup AES ciphers * @addtogroup AES ciphers

14
osi/core/macsec.c
View File

@@ -26,21 +26,7 @@
#include "../osi/common/common.h" #include "../osi/common/common.h"
#include "core_local.h" #include "core_local.h"
#if defined(DEBUG_MACSEC) && defined(QNX_OS)
#define LOG(...) \
{ \
slogf(0, 6, ##__VA_ARGS__); \
}
#elif defined(DEBUG_MACSEC) && defined(LINUX_OS)
#include <linux/printk.h>
#define LOG(...) \
{ \
pr_debug(__VA_ARGS__); \
}
#else
#define LOG(...) #define LOG(...)
#endif
#ifdef DEBUG_MACSEC #ifdef DEBUG_MACSEC
/** /**

4
osi/core/macsec.h
View File

@@ -453,10 +453,10 @@
#define MACSEC_RX_SCI_LUT_PREEMPT_INACTIVE OSI_BIT(9) #define MACSEC_RX_SCI_LUT_PREEMPT_INACTIVE OSI_BIT(9)
/** @} */ /** @} */
#ifndef OSI_STRIPPED_LIB #ifdef DEBUG_MACSEC
/* debug buffer data read/write length */ /* debug buffer data read/write length */
#define DBG_BUF_LEN 4U #define DBG_BUF_LEN 4U
#endif /* !OSI_STRIPPED_LIB */ #endif /* DEBUG_MACSEC */
#ifdef MACSEC_KEY_PROGRAM #ifdef MACSEC_KEY_PROGRAM
#define INTEGER_LEN 4U #define INTEGER_LEN 4U
#endif /* MACSEC_KEY_PROGRAM */ #endif /* MACSEC_KEY_PROGRAM */

2
osi/dma/debug.c
View File

@@ -129,7 +129,9 @@ void reg_dump(struct osi_dma_priv_data *osi_dma)
max_addr = 0x14EC; max_addr = 0x14EC;
break; break;
case OSI_MGBE_MAC_3_10: case OSI_MGBE_MAC_3_10:
#ifndef OSI_STRIPPED_LIB
case OSI_MGBE_MAC_4_00: case OSI_MGBE_MAC_4_00:
#endif
addr = 0x3100; addr = 0x3100;
max_addr = 0x35FC; max_addr = 0x35FC;
break; break;