Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32292159 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: secure_buffer: Add WLAN support" into msm-4.8

parents d7dd8bcd 253b23dc

drivers/soc/qcom/secure_buffer.c

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 Google, Inc

 * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -375,6 +375,10 @@ const char *msm_secure_vmid_to_string(int secure_vmid) 
		return "VMID_CP_SEC_DISPLAY";

	case VMID_CP_APP:

		return "VMID_CP_APP";

	case VMID_WLAN:

		return "VMID_WLAN";

	case VMID_WLAN_CE:

		return "VMID_WLAN_CE";

	case VMID_INVAL:

		return "VMID_INVAL";

	default:

include/soc/qcom/secure_buffer.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#define VMID_MSS_NONMSA 0x10

#define VMID_CP_SEC_DISPLAY 0x11

#define VMID_CP_APP 0x12

#define VMID_WLAN 0x18

#define VMID_WLAN_CE 0x19

#define VMID_INVAL -1

/*

 * if you add a secure VMID here make sure you update