Linux: Update user AF_RPMSG define for 5.15+ kernels

IPC's Linux user space support contains a copy of a few
kernel-defined structs and definitions including the socket
address family used for rpmsg-based sockets - AF_RPMSG. This
driver is currently out-of-tree and so it's definition is
always 'one more' than the last address family defined by
the mainline kernel's socket.h.

A new address family was introduced in 5.15 (AF_MCTP), and as
a result, the AF_RPMSG macro needs to be set to 46 post 5.15
kernel. The user space header has been updated to reflect on
the kernel version and appropriately assign the value of
AF_RPMSG.

Do note that a specific value of AF_RPMSG can always be provided
through the products.mak when KERNEL_INSTALL_DIR is not set.

Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>

diff --git a/linux/include/net/rpmsg.h b/linux/include/net/rpmsg.h
index 6eab3c65faa67b1706c97c6df926cd1e729bdb3c..85c6ee5175d38f0f65b66f69866a1a376f921553 100644 (file)
--- a/linux/include/net/rpmsg.h
+++ b/linux/include/net/rpmsg.h
@@ -56,8 +56,10 @@
 #define AF_RPMSG        43
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(4,18,0)
 #define AF_RPMSG        44
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0)
 #define AF_RPMSG        45
+#else
+#define AF_RPMSG        46
 #endif /* LINUX_VERSION_CODE */
 #endif /* AF_RPMSG */
 

diff --git a/packages/ti/sdo/ipc/family/am65xx/NotifySciClient.c b/packages/ti/sdo/ipc/family/am65xx/NotifySciClient.c
index 62374e255e67a6036e6a91d27b31e65c666c511e..f4717af69b0568eef40326afa33cba098ec03d33 100644 (file)
--- a/packages/ti/sdo/ipc/family/am65xx/NotifySciClient.c
+++ b/packages/ti/sdo/ipc/family/am65xx/NotifySciClient.c
@@ -265,17 +265,17 @@ Int32 NotifySciClient_getIntNumRange(NotifySciClient_CoreIndex coreIndex,
     const uint16_t req_type[] =
     {
         /* NOTE: This list should match the Core index */
-        TISCI_RESASG_TYPE_GIC_IRQ,
-        TISCI_RESASG_TYPE_PULSAR_C0_IRQ,
-        TISCI_RESASG_TYPE_PULSAR_C1_IRQ
+        TISCI_DEV_GIC0,
+        TISCI_DEV_MCU_ARMSS0_CPU0,
+        TISCI_DEV_MCU_ARMSS0_CPU1
     };
    /* Indexed list of req subtype */
     const uint16_t req_subtype[] =
     {
         /* NOTE: This list should match the Core index */
-        TISCI_RESASG_SUBTYPE_GIC_IRQ_MAIN_NAV_SET1,
-        TISCI_RESASG_SUBTYPE_PULSAR_C0_IRQ_MAIN2MCU_LVL,
-        TISCI_RESASG_SUBTYPE_PULSAR_C1_IRQ_MAIN2MCU_LVL
+        TISCI_RESASG_SUBTYPE_GIC0_SPI_IRQ_GROUP0_FROM_NAVSS0_INTR_ROUTER_0,
+        TISCI_RESASG_SUBTYPE_MCU_ARMSS0_CPU0_INTR_IRQ_GROUP0_FROM_MAIN2MCU_LVL_INTRTR0,
+        TISCI_RESASG_SUBTYPE_MCU_ARMSS0_CPU1_INTR_IRQ_GROUP0_FROM_MAIN2MCU_LVL_INTRTR0
     };
 
     /* Indexed list of host ids */