Commit 82d939ec authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'opw-next' into staging-next 



This pulls in all of the staging patches applied during the opw
application process, and some other staging patches that were submitted
during that period of time.  All of these are for 3.14-rc1.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 6ce4eac1 4f317748

drivers/staging/android/alarm-dev.c

+3 −5
Original line number Diff line number Diff line
@@ -68,11 +68,10 @@ static struct devalarm alarms[ANDROID_ALARM_TYPE_COUNT]; 
 */

static int is_wakeup(enum android_alarm_type type)

{

	return (type == ANDROID_ALARM_RTC_WAKEUP ||

		type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP);

	return type == ANDROID_ALARM_RTC_WAKEUP ||

		type == ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP;

}





static void devalarm_start(struct devalarm *alrm, ktime_t exp)

{

	if (is_wakeup(alrm->type))
@@ -111,7 +110,6 @@ static void alarm_clear(enum android_alarm_type alarm_type) 
	}

	alarm_enabled &= ~alarm_type_mask;

	spin_unlock_irqrestore(&alarm_slock, flags);



}



static void alarm_set(enum android_alarm_type alarm_type,
@@ -280,6 +278,7 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	return 0;

}



#ifdef CONFIG_COMPAT

static long alarm_compat_ioctl(struct file *file, unsigned int cmd,

							unsigned long arg)
@@ -371,7 +370,6 @@ static void devalarm_triggered(struct devalarm *alarm) 
	spin_unlock_irqrestore(&alarm_slock, flags);

}





static enum hrtimer_restart devalarm_hrthandler(struct hrtimer *hrt)

{

	struct devalarm *devalrm = container_of(hrt, struct devalarm, u.hrt);

drivers/staging/android/sync.h

+25 −25
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct sync_fence; 


/**

 * struct sync_timeline_ops - sync object implementation ops

 * @driver_name:	name of the implentation

 * @driver_name:	name of the implementation

 * @dup:		duplicate a sync_pt

 * @has_signaled:	returns:

 *			  1 if pt has signaled
@@ -37,12 +37,12 @@ struct sync_fence; 
 * @compare:		returns:

 *			  1 if b will signal before a

 *			  0 if a and b will signal at the same time

 *			 -1 if a will signabl before b

 *			 -1 if a will signal before b

 * @free_pt:		called before sync_pt is freed

 * @release_obj:	called before sync_timeline is freed

 * @print_obj:		deprecated

 * @print_pt:		deprecated

 * @fill_driver_data:	write implmentation specific driver data to data.

 * @fill_driver_data:	write implementation specific driver data to data.

 *			  should return an error if there is not enough room

 *			  as specified by size.  This information is returned

 *			  to userspace by SYNC_IOC_FENCE_INFO.
@@ -88,9 +88,9 @@ struct sync_timeline_ops { 
/**

 * struct sync_timeline - sync object

 * @kref:		reference count on fence.

 * @ops:		ops that define the implementaiton of the sync_timeline

 * @ops:		ops that define the implementation of the sync_timeline

 * @name:		name of the sync_timeline. Useful for debugging

 * @destoryed:		set when sync_timeline is destroyed

 * @destroyed:		set when sync_timeline is destroyed

 * @child_list_head:	list of children sync_pts for this sync_timeline

 * @child_list_lock:	lock protecting @child_list_head, destroyed, and

 *			  sync_pt.status
@@ -119,12 +119,12 @@ struct sync_timeline { 
 * @parent:		sync_timeline to which this sync_pt belongs

 * @child_list:		membership in sync_timeline.child_list_head

 * @active_list:	membership in sync_timeline.active_list_head

 * @signaled_list:	membership in temorary signaled_list on stack

 * @signaled_list:	membership in temporary signaled_list on stack

 * @fence:		sync_fence to which the sync_pt belongs

 * @pt_list:		membership in sync_fence.pt_list_head

 * @status:		1: signaled, 0:active, <0: error

 * @timestamp:		time which sync_pt status transitioned from active to

 *			  singaled or error.

 *			  signaled or error.

 */

struct sync_pt {

	struct sync_timeline		*parent;
@@ -145,9 +145,9 @@ struct sync_pt { 
/**

 * struct sync_fence - sync fence

 * @file:		file representing this fence

 * @kref:		referenace count on fence.

 * @kref:		reference count on fence.

 * @name:		name of sync_fence.  Useful for debugging

 * @pt_list_head:	list of sync_pts in ths fence.  immutable once fence

 * @pt_list_head:	list of sync_pts in the fence.  immutable once fence

 *			  is created

 * @waiter_list_head:	list of asynchronous waiters on this fence

 * @waiter_list_lock:	lock protecting @waiter_list_head and @status
@@ -201,23 +201,23 @@ static inline void sync_fence_waiter_init(struct sync_fence_waiter *waiter, 


/**

 * sync_timeline_create() - creates a sync object

 * @ops:	specifies the implemention ops for the object

 * @ops:	specifies the implementation ops for the object

 * @size:	size to allocate for this obj

 * @name:	sync_timeline name

 *

 * Creates a new sync_timeline which will use the implemetation specified by

 * @ops.  @size bytes will be allocated allowing for implemntation specific

 * data to be kept after the generic sync_timeline stuct.

 * Creates a new sync_timeline which will use the implementation specified by

 * @ops.  @size bytes will be allocated allowing for implementation specific

 * data to be kept after the generic sync_timeline struct.

 */

struct sync_timeline *sync_timeline_create(const struct sync_timeline_ops *ops,

					   int size, const char *name);



/**

 * sync_timeline_destory() - destorys a sync object

 * sync_timeline_destroy() - destroys a sync object

 * @obj:	sync_timeline to destroy

 *

 * A sync implemntation should call this when the @obj is going away

 * (i.e. module unload.)  @obj won't actually be freed until all its childern

 * A sync implementation should call this when the @obj is going away

 * (i.e. module unload.)  @obj won't actually be freed until all its children

 * sync_pts are freed.

 */

void sync_timeline_destroy(struct sync_timeline *obj);
@@ -226,7 +226,7 @@ void sync_timeline_destroy(struct sync_timeline *obj); 
 * sync_timeline_signal() - signal a status change on a sync_timeline

 * @obj:	sync_timeline to signal

 *

 * A sync implemntation should call this any time one of it's sync_pts

 * A sync implementation should call this any time one of it's sync_pts

 * has signaled or has an error condition.

 */

void sync_timeline_signal(struct sync_timeline *obj);
@@ -236,8 +236,8 @@ void sync_timeline_signal(struct sync_timeline *obj); 
 * @parent:	sync_pt's parent sync_timeline

 * @size:	size to allocate for this pt

 *

 * Creates a new sync_pt as a chiled of @parent.  @size bytes will be

 * allocated allowing for implemntation specific data to be kept after

 * Creates a new sync_pt as a child of @parent.  @size bytes will be

 * allocated allowing for implementation specific data to be kept after

 * the generic sync_timeline struct.

 */

struct sync_pt *sync_pt_create(struct sync_timeline *parent, int size);
@@ -287,7 +287,7 @@ struct sync_fence *sync_fence_merge(const char *name, 
struct sync_fence *sync_fence_fdget(int fd);



/**

 * sync_fence_put() - puts a refernnce of a sync fence

 * sync_fence_put() - puts a reference of a sync fence

 * @fence:	fence to put

 *

 * Puts a reference on @fence.  If this is the last reference, the fence and
@@ -297,7 +297,7 @@ void sync_fence_put(struct sync_fence *fence); 


/**

 * sync_fence_install() - installs a fence into a file descriptor

 * @fence:	fence to instal

 * @fence:	fence to install

 * @fd:		file descriptor in which to install the fence

 *

 * Installs @fence into @fd.  @fd's should be acquired through get_unused_fd().
@@ -359,10 +359,10 @@ struct sync_merge_data { 
 * struct sync_pt_info - detailed sync_pt information

 * @len:		length of sync_pt_info including any driver_data

 * @obj_name:		name of parent sync_timeline

 * @driver_name:	name of driver implmenting the parent

 * @driver_name:	name of driver implementing the parent

 * @status:		status of the sync_pt 0:active 1:signaled <0:error

 * @timestamp_ns:	timestamp of status change in nanoseconds

 * @driver_data:	any driver dependant data

 * @driver_data:	any driver dependent data

 */

struct sync_pt_info {

	__u32	len;
@@ -377,7 +377,7 @@ struct sync_pt_info { 
/**

 * struct sync_fence_info_data - data returned from fence info ioctl

 * @len:	ioctl caller writes the size of the buffer its passing in.

 *		ioctl returns length of sync_fence_data reutnred to userspace

 *		ioctl returns length of sync_fence_data returned to userspace

 *		including pt_info.

 * @name:	name of fence

 * @status:	status of fence. 1: signaled 0:active <0:error
@@ -418,7 +418,7 @@ struct sync_fence_info_data { 
 * pt_info.

 *

 * pt_info is a buffer containing sync_pt_infos for every sync_pt in the fence.

 * To itterate over the sync_pt_infos, use the sync_pt_info.len field.

 * To iterate over the sync_pt_infos, use the sync_pt_info.len field.

 */

#define SYNC_IOC_FENCE_INFO	_IOWR(SYNC_IOC_MAGIC, 2,\

	struct sync_fence_info_data)

drivers/staging/bcm/Bcmchar.c

+94 −42
Original line number Diff line number Diff line
@@ -160,7 +160,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	struct bcm_ioctl_buffer IoBuffer;

	int bytes;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX", cmd, arg);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

			"Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX",

			cmd, arg);



	if (_IOC_TYPE(cmd) != BCM_IOCTL)

		return -EFAULT;
@@ -266,7 +268,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
				(uiTempVar == EEPROM_REJECT_REG_3) ||

				(uiTempVar == EEPROM_REJECT_REG_4))) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "EEPROM Access Denied, not in VSG Mode\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"EEPROM Access Denied, not in VSG Mode\n");

			return -EFAULT;

		}
@@ -274,9 +277,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
				(PUINT)sWrmBuffer.Data, sizeof(ULONG));



		if (Status == STATUS_SUCCESS) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "WRM Done\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL, "WRM Done\n");

		} else {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "WRM Failed\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL, "WRM Failed\n");

			Status = -EFAULT;

		}

		break;
@@ -291,7 +296,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			(Adapter->bShutStatus == TRUE) ||

			(Adapter->bPreparingForLowPowerMode == TRUE)) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Device in Idle Mode, Blocking Rdms\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"Device in Idle Mode, Blocking Rdms\n");

			return -EACCES;

		}
@@ -317,7 +323,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if ((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||

			((ULONG)sRdmBuffer.Register & 0x3)) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM Done On invalid Address : %x Access Denied.\n",

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"RDM Done On invalid Address : %x Access Denied.\n",

					(int)sRdmBuffer.Register);



			kfree(temp_buff);
@@ -325,7 +332,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		}



		uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;

		bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);

		bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register,

				       (PUINT)temp_buff, IoBuffer.OutputLength);



		if (bytes > 0) {

			Status = STATUS_SUCCESS;
@@ -349,7 +357,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			(Adapter->bShutStatus == TRUE) ||

			(Adapter->bPreparingForLowPowerMode == TRUE)) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Device in Idle Mode, Blocking Wrms\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"Device in Idle Mode, Blocking Wrms\n");

			return -EACCES;

		}
@@ -367,7 +376,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||

			((ULONG)sWrmBuffer.Register & 0x3)) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM Done On invalid Address : %x Access Denied.\n", (int)sWrmBuffer.Register);

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"WRM Done On invalid Address : %x Access Denied.\n",

					(int)sWrmBuffer.Register);

			return -EINVAL;

		}
@@ -379,17 +390,21 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
				(uiTempVar == EEPROM_REJECT_REG_4)) &&

				(cmd == IOCTL_BCM_REGISTER_WRITE)) {



				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "EEPROM Access Denied, not in VSG Mode\n");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

						"EEPROM Access Denied, not in VSG Mode\n");

				return -EFAULT;

		}



		Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,

					(PUINT)sWrmBuffer.Data, sWrmBuffer.Length);

					(PUINT)sWrmBuffer.Data,

					sWrmBuffer.Length);



		if (Status == STATUS_SUCCESS) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "WRM Done\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG,

					DBG_LVL_ALL, "WRM Done\n");

		} else {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "WRM Failed\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL, "WRM Failed\n");

			Status = -EFAULT;

		}

		break;
@@ -405,7 +420,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			(Adapter->bShutStatus == TRUE) ||

			(Adapter->bPreparingForLowPowerMode == TRUE)) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "GPIO Can't be set/clear in Low power Mode");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL,

					"GPIO Can't be set/clear in Low power Mode");

			return -EACCES;

		}
@@ -423,7 +440,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		value = (1<<uiBit);



		if (IsReqGpioIsLedInNVM(Adapter, value) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Sorry, Requested GPIO<0x%X> is not correspond to LED !!!", value);

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL,

					"Sorry, Requested GPIO<0x%X> is not correspond to LED !!!",

					value);

			Status = -EINVAL;

			break;

		}
@@ -431,27 +451,42 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		/* Set - setting 1 */

		if (uiOperation) {

			/* Set the gpio output register */

			Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG, (PUINT)(&value), sizeof(UINT));

			Status = wrmaltWithLock(Adapter,

						BCM_GPIO_OUTPUT_SET_REG,

						(PUINT)(&value), sizeof(UINT));



			if (Status == STATUS_SUCCESS) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Set the GPIO bit\n");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

						OSAL_DBG, DBG_LVL_ALL,

						"Set the GPIO bit\n");

			} else {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Failed to set the %dth GPIO\n", uiBit);

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

						OSAL_DBG, DBG_LVL_ALL,

						"Failed to set the %dth GPIO\n",

						uiBit);

				break;

			}

		} else {

			/* Set the gpio output register */

			Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)(&value), sizeof(UINT));

			Status = wrmaltWithLock(Adapter,

						BCM_GPIO_OUTPUT_CLR_REG,

						(PUINT)(&value), sizeof(UINT));



			if (Status == STATUS_SUCCESS) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Set the GPIO bit\n");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

						OSAL_DBG, DBG_LVL_ALL,

						"Set the GPIO bit\n");

			} else {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Failed to clear the %dth GPIO\n", uiBit);

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

						OSAL_DBG, DBG_LVL_ALL,

						"Failed to clear the %dth GPIO\n",

						uiBit);

				break;

			}

		}



		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));

		bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER,

				       (PUINT)ucResetValue, sizeof(UINT));

		if (bytes < 0) {

			Status = bytes;

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
@@ -467,9 +502,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
					(PUINT)ucResetValue, sizeof(UINT));



		if (Status == STATUS_SUCCESS) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Set the GPIO to output Mode\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL,

					"Set the GPIO to output Mode\n");

		} else {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Failed to put GPIO in Output Mode\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL,

					"Failed to put GPIO in Output Mode\n");

			break;

		}

	}
@@ -477,13 +516,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 


	case BCM_LED_THREAD_STATE_CHANGE_REQ: {

		struct bcm_user_thread_req threadReq = {0};

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "User made LED thread InActive");

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

				"User made LED thread InActive");



		if ((Adapter->IdleMode == TRUE) ||

			(Adapter->bShutStatus == TRUE) ||

			(Adapter->bPreparingForLowPowerMode == TRUE)) {



			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "GPIO Can't be set/clear in Low power Mode");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL,

					"GPIO Can't be set/clear in Low power Mode");

			Status = -EACCES;

			break;

		}
@@ -500,10 +542,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
		/* if LED thread is running(Actively or Inactively) set it state to make inactive */

		if (Adapter->LEDInfo.led_thread_running) {

			if (threadReq.ThreadState == LED_THREAD_ACTIVATION_REQ) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Activating thread req");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

						OSAL_DBG, DBG_LVL_ALL,

						"Activating thread req");

				Adapter->DriverState = LED_THREAD_ACTIVE;

			} else {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DeActivating Thread req.....");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

						OSAL_DBG, DBG_LVL_ALL,

						"DeActivating Thread req.....");

				Adapter->DriverState = LED_THREAD_INACTIVE;

			}
@@ -540,7 +586,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 


		if (bytes < 0) {

			Status = bytes;

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM Failed\n");

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

					"RDM Failed\n");

			return Status;

		} else {

			Status = STATUS_SUCCESS;
@@ -570,9 +617,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			return -EFAULT;



		if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,

					DBG_LVL_ALL,

					"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",

					pgpio_multi_info[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);

					pgpio_multi_info[WIMAX_IDX].uiGPIOMask,

					Adapter->gpioBitMap);

			Status = -EINVAL;

			break;

		}
@@ -590,7 +639,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
							(PUINT)ucResetValue, sizeof(ULONG));



			if (Status != STATUS_SUCCESS) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM to BCM_GPIO_OUTPUT_SET_REG Failed.");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

						"WRM to BCM_GPIO_OUTPUT_SET_REG Failed.");

				return Status;

			}
@@ -603,7 +653,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
				Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue, sizeof(ULONG));



			if (Status != STATUS_SUCCESS) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM to BCM_GPIO_OUTPUT_CLR_REG Failed.");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

						"WRM to BCM_GPIO_OUTPUT_CLR_REG Failed.");

				return Status;

			}

		}
@@ -613,7 +664,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 


			if (bytes < 0) {

				Status = bytes;

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM to GPIO_PIN_STATE_REGISTER Failed.");

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,

						"RDM to GPIO_PIN_STATE_REGISTER Failed.");

				return Status;

			} else {

				Status = STATUS_SUCCESS;

drivers/staging/bcm/DDRInit.c

+749 −752
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ static struct bcm_ddr_setting asT3LP_DDRSetting80MHz[]= {// # DPLL Clock Setting 


#define T3LPB_SKIP_CLOCK_PROGRAM_DUMP_160MHZ 7  //index for 0x0F007000

static struct bcm_ddr_setting asT3LPB_DDRSetting160MHz[] = {//	# DPLL Clock Setting



								{0x0f000820, 0x03F137DB},

								{0x0f000810, 0x01842795},

								{0x0f000860, 0x00000000},
@@ -1285,5 +1284,3 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter) 
	}

	return retval;

}

drivers/staging/comedi/comedi_buf.c

+69 −30
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include <linux/vmalloc.h>

#include <linux/slab.h>



#include "comedidev.h"

#include "comedi_internal.h"
@@ -26,31 +27,21 @@ 
#define COMEDI_PAGE_PROTECTION		PAGE_KERNEL

#endif



static void __comedi_buf_free(struct comedi_device *dev,

			      struct comedi_subdevice *s,

			      unsigned n_pages)

static void comedi_buf_map_kref_release(struct kref *kref)

{

	struct comedi_async *async = s->async;

	struct comedi_buf_map *bm =

		container_of(kref, struct comedi_buf_map, refcount);

	struct comedi_buf_page *buf;

	unsigned i;



	if (async->prealloc_buf) {

		vunmap(async->prealloc_buf);

		async->prealloc_buf = NULL;

		async->prealloc_bufsz = 0;

	}



	if (!async->buf_page_list)

		return;

	unsigned int i;



	for (i = 0; i < n_pages; ++i) {

		buf = &async->buf_page_list[i];

		if (buf->virt_addr) {

	if (bm->page_list) {

		for (i = 0; i < bm->n_pages; i++) {

			buf = &bm->page_list[i];

			clear_bit(PG_reserved,

				  &(virt_to_page(buf->virt_addr)->flags));

			if (s->async_dma_dir != DMA_NONE) {

			if (bm->dma_dir != DMA_NONE) {

#ifdef CONFIG_HAS_DMA

				dma_free_coherent(dev->hw_dev,

				dma_free_coherent(bm->dma_hw_dev,

						  PAGE_SIZE,

						  buf->virt_addr,

						  buf->dma_addr);
@@ -59,10 +50,26 @@ static void __comedi_buf_free(struct comedi_device *dev, 
				free_page((unsigned long)buf->virt_addr);

			}

		}

		vfree(bm->page_list);

	}

	vfree(async->buf_page_list);

	async->buf_page_list = NULL;

	async->n_buf_pages = 0;

	if (bm->dma_dir != DMA_NONE)

		put_device(bm->dma_hw_dev);

	kfree(bm);

}



static void __comedi_buf_free(struct comedi_device *dev,

			      struct comedi_subdevice *s)

{

	struct comedi_async *async = s->async;



	if (async->prealloc_buf) {

		vunmap(async->prealloc_buf);

		async->prealloc_buf = NULL;

		async->prealloc_bufsz = 0;

	}



	comedi_buf_map_put(async->buf_map);

	async->buf_map = NULL;

}



static void __comedi_buf_alloc(struct comedi_device *dev,
@@ -71,6 +78,7 @@ static void __comedi_buf_alloc(struct comedi_device *dev, 
{

	struct comedi_async *async = s->async;

	struct page **pages = NULL;

	struct comedi_buf_map *bm;

	struct comedi_buf_page *buf;

	unsigned i;
@@ -80,18 +88,29 @@ static void __comedi_buf_alloc(struct comedi_device *dev, 
		return;

	}



	async->buf_page_list = vzalloc(sizeof(*buf) * n_pages);

	if (async->buf_page_list)

	bm = kzalloc(sizeof(*async->buf_map), GFP_KERNEL);

	if (!bm)

		return;



	async->buf_map = bm;

	kref_init(&bm->refcount);

	bm->dma_dir = s->async_dma_dir;

	if (bm->dma_dir != DMA_NONE)

		/* Need ref to hardware device to free buffer later. */

		bm->dma_hw_dev = get_device(dev->hw_dev);



	bm->page_list = vzalloc(sizeof(*buf) * n_pages);

	if (bm->page_list)

		pages = vmalloc(sizeof(struct page *) * n_pages);



	if (!pages)

		return;



	for (i = 0; i < n_pages; i++) {

		buf = &async->buf_page_list[i];

		if (s->async_dma_dir != DMA_NONE)

		buf = &bm->page_list[i];

		if (bm->dma_dir != DMA_NONE)

#ifdef CONFIG_HAS_DMA

			buf->virt_addr = dma_alloc_coherent(dev->hw_dev,

			buf->virt_addr = dma_alloc_coherent(bm->dma_hw_dev,

							    PAGE_SIZE,

							    &buf->dma_addr,

							    GFP_KERNEL |
@@ -108,6 +127,7 @@ static void __comedi_buf_alloc(struct comedi_device *dev, 


		pages[i] = virt_to_page(buf->virt_addr);

	}

	bm->n_pages = i;



	/* vmap the prealloc_buf if all the pages were allocated */

	if (i == n_pages)
@@ -117,6 +137,26 @@ static void __comedi_buf_alloc(struct comedi_device *dev, 
	vfree(pages);

}



void comedi_buf_map_get(struct comedi_buf_map *bm)

{

	if (bm)

		kref_get(&bm->refcount);

}



int comedi_buf_map_put(struct comedi_buf_map *bm)

{

	if (bm)

		return kref_put(&bm->refcount, comedi_buf_map_kref_release);

	return 1;

}



bool comedi_buf_is_mmapped(struct comedi_async *async)

{

	struct comedi_buf_map *bm = async->buf_map;



	return bm && (atomic_read(&bm->refcount.refcount) > 1);

}



int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,

		     unsigned long new_size)

{
@@ -130,7 +170,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, 
		return 0;



	/* deallocate old buffer */

	__comedi_buf_free(dev, s, async->n_buf_pages);

	__comedi_buf_free(dev, s);



	/* allocate new buffer */

	if (new_size) {
@@ -140,10 +180,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, 


		if (!async->prealloc_buf) {

			/* allocation failed */

			__comedi_buf_free(dev, s, n_pages);

			__comedi_buf_free(dev, s);

			return -ENOMEM;

		}

		async->n_buf_pages = n_pages;

	}

	async->prealloc_bufsz = new_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE