Merge "soc: qcom: hab: add one physical channel group for GPCE"

drivers/soc/qcom/hab/hab.c

@@ -54,6 +54,7 @@ static struct hab_device hab_devices[] = {
 	HAB_DEVICE_CNSTR(DEVICE_XVM3_NAME, MM_XVM_3, 26),
 	HAB_DEVICE_CNSTR(DEVICE_VNW1_NAME, MM_VNW_1, 27),
 	HAB_DEVICE_CNSTR(DEVICE_EXT1_NAME, MM_EXT_1, 28),
+	HAB_DEVICE_CNSTR(DEVICE_GPCE1_NAME, MM_GPCE_1, 29),
 };
 
 struct hab_driver hab_driver = {
@@ -932,6 +933,9 @@ static int hab_generate_pchan(struct local_vmid *settings, int i, int j)
 	case MM_EXT_START/100:
 		ret = hab_generate_pchan_group(settings, i, j, MM_EXT_START, MM_EXT_END);
 		break;
+	case MM_GPCE_START/100:
+		ret = hab_generate_pchan_group(settings, i, j, MM_GPCE_START, MM_GPCE_END);
+		break;
 	default:
 		pr_err("failed to find mmid %d, i %d, j %d\n",
 			HABCFG_GET_MMID(settings, i, j), i, j);

drivers/soc/qcom/hab/hab.h

@@ -62,6 +62,7 @@ enum hab_payload_type {
 #define DEVICE_XVM3_NAME "hab_xvm3"
 #define DEVICE_VNW1_NAME "hab_vnw1"
 #define DEVICE_EXT1_NAME "hab_ext1"
+#define DEVICE_GPCE1_NAME "hab_gpce1"
 
 #define HABCFG_MMID_NUM        26
 #define HAB_MMID_ALL_AREA      0

include/uapi/linux/habmmid.h

@@ -82,6 +82,10 @@
 #define	MM_EXT_1 1501
 #define	MM_EXT_END 1502
 
-#define	MM_ID_MAX	1503
+#define	MM_GPCE_START 1600
+#define	MM_GPCE_1 1601
+#define	MM_GPCE_END 1602
+
+#define	MM_ID_MAX 1603
 
 #endif /* HABMMID_H */