|
@@ -150,7 +150,8 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
|
|
return PktLen;
|
|
return PktLen;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_reg_read_private(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_reg_read_private(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_rdm_buffer sRdmBuffer = {0};
|
|
struct bcm_rdm_buffer sRdmBuffer = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -167,7 +168,8 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp, struct bcm_mini_ad
|
|
if (IoBuffer.InputLength > sizeof(sRdmBuffer))
|
|
if (IoBuffer.InputLength > sizeof(sRdmBuffer))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
if (IoBuffer.OutputLength > USHRT_MAX ||
|
|
if (IoBuffer.OutputLength > USHRT_MAX ||
|
|
@@ -199,7 +201,8 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp, struct bcm_mini_ad
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_reg_write_private(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_reg_write_private(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_wrm_buffer sWrmBuffer = {0};
|
|
struct bcm_wrm_buffer sWrmBuffer = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -215,7 +218,8 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp, struct bcm_mini_a
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
/* Get WrmBuffer structure */
|
|
/* Get WrmBuffer structure */
|
|
- if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
|
|
uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
|
|
@@ -244,7 +248,8 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp, struct bcm_mini_a
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_rdm_buffer sRdmBuffer = {0};
|
|
struct bcm_rdm_buffer sRdmBuffer = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -269,7 +274,8 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, struct bcm_mini_ada
|
|
if (IoBuffer.InputLength > sizeof(sRdmBuffer))
|
|
if (IoBuffer.InputLength > sizeof(sRdmBuffer))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
if (IoBuffer.OutputLength > USHRT_MAX ||
|
|
if (IoBuffer.OutputLength > USHRT_MAX ||
|
|
@@ -310,7 +316,8 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, struct bcm_mini_ada
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_eeprom_reg_write(void __user *argp, struct bcm_mini_adapter *Adapter, UINT cmd)
|
|
|
|
|
|
+static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter, UINT cmd)
|
|
{
|
|
{
|
|
struct bcm_wrm_buffer sWrmBuffer = {0};
|
|
struct bcm_wrm_buffer sWrmBuffer = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -334,7 +341,8 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp, struct bcm_mini_ad
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
/* Get WrmBuffer structure */
|
|
/* Get WrmBuffer structure */
|
|
- if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
|
|
if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
|
|
@@ -374,7 +382,8 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp, struct bcm_mini_ad
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_gpio_set_request(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_gpio_set_request(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_gpio_info gpio_info = {0};
|
|
struct bcm_gpio_info gpio_info = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -482,7 +491,8 @@ static int bcm_char_ioctl_gpio_set_request(void __user *argp, struct bcm_mini_ad
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_led_thread_state_change_req(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_led_thread_state_change_req(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_user_thread_req threadReq = {0};
|
|
struct bcm_user_thread_req threadReq = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -509,7 +519,9 @@ static int bcm_char_ioctl_led_thread_state_change_req(void __user *argp, struct
|
|
if (copy_from_user(&threadReq, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
if (copy_from_user(&threadReq, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- /* if LED thread is running(Actively or Inactively) set it state to make inactive */
|
|
|
|
|
|
+ /* if LED thread is running(Actively or Inactively)
|
|
|
|
+ * set it state to make inactive
|
|
|
|
+ */
|
|
if (Adapter->LEDInfo.led_thread_running) {
|
|
if (Adapter->LEDInfo.led_thread_running) {
|
|
if (threadReq.ThreadState == LED_THREAD_ACTIVATION_REQ) {
|
|
if (threadReq.ThreadState == LED_THREAD_ACTIVATION_REQ) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
|
|
@@ -529,7 +541,8 @@ static int bcm_char_ioctl_led_thread_state_change_req(void __user *argp, struct
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_gpio_status_request(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_gpio_status_request(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_gpio_info gpio_info = {0};
|
|
struct bcm_gpio_info gpio_info = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -549,7 +562,8 @@ static int bcm_char_ioctl_gpio_status_request(void __user *argp, struct bcm_mini
|
|
if (IoBuffer.InputLength > sizeof(gpio_info))
|
|
if (IoBuffer.InputLength > sizeof(gpio_info))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- if (copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&gpio_info, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
uiBit = gpio_info.uiGpioNumber;
|
|
uiBit = gpio_info.uiGpioNumber;
|
|
@@ -569,10 +583,12 @@ static int bcm_char_ioctl_gpio_status_request(void __user *argp, struct bcm_mini
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_gpio_multi_request(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_gpio_multi_request(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_gpio_multi_info gpio_multi_info[MAX_IDX];
|
|
struct bcm_gpio_multi_info gpio_multi_info[MAX_IDX];
|
|
- struct bcm_gpio_multi_info *pgpio_multi_info = (struct bcm_gpio_multi_info *)gpio_multi_info;
|
|
|
|
|
|
+ struct bcm_gpio_multi_info *pgpio_multi_info =
|
|
|
|
+ (struct bcm_gpio_multi_info *)gpio_multi_info;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
UCHAR ucResetValue[4];
|
|
UCHAR ucResetValue[4];
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
@@ -593,10 +609,12 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp, struct bcm_mini_
|
|
if (IoBuffer.OutputLength > sizeof(gpio_multi_info))
|
|
if (IoBuffer.OutputLength > sizeof(gpio_multi_info))
|
|
IoBuffer.OutputLength = sizeof(gpio_multi_info);
|
|
IoBuffer.OutputLength = sizeof(gpio_multi_info);
|
|
|
|
|
|
- if (copy_from_user(&gpio_multi_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&gpio_multi_info, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {
|
|
|
|
|
|
+ if (IsReqGpioIsLedInNVM(Adapter,
|
|
|
|
+ pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
DBG_LVL_ALL,
|
|
DBG_LVL_ALL,
|
|
"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
|
|
"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
|
|
@@ -614,22 +632,25 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp, struct bcm_mini_
|
|
pgpio_multi_info[WIMAX_IDX].uiGPIOValue;
|
|
pgpio_multi_info[WIMAX_IDX].uiGPIOValue;
|
|
|
|
|
|
if (*(UINT *) ucResetValue)
|
|
if (*(UINT *) ucResetValue)
|
|
- Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG,
|
|
|
|
- (PUINT)ucResetValue, sizeof(ULONG));
|
|
|
|
|
|
+ Status = wrmaltWithLock(Adapter,
|
|
|
|
+ BCM_GPIO_OUTPUT_SET_REG,
|
|
|
|
+ (PUINT)ucResetValue, sizeof(ULONG));
|
|
|
|
|
|
if (Status != STATUS_SUCCESS) {
|
|
if (Status != STATUS_SUCCESS) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
- "WRM to BCM_GPIO_OUTPUT_SET_REG Failed.");
|
|
|
|
|
|
+ "WRM to BCM_GPIO_OUTPUT_SET_REG Failed.");
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
/* Clear to 0's in GPIO OUTPUT REGISTER */
|
|
/* Clear to 0's in GPIO OUTPUT REGISTER */
|
|
*(UINT *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
|
|
*(UINT *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
|
|
- pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
|
|
|
|
- (~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
|
|
|
|
|
|
+ pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
|
|
|
|
+ (~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
|
|
|
|
|
|
if (*(UINT *) ucResetValue)
|
|
if (*(UINT *) ucResetValue)
|
|
- Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue, sizeof(ULONG));
|
|
|
|
|
|
+ Status = wrmaltWithLock(Adapter,
|
|
|
|
+ BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue,
|
|
|
|
+ sizeof(ULONG));
|
|
|
|
|
|
if (Status != STATUS_SUCCESS) {
|
|
if (Status != STATUS_SUCCESS) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
@@ -639,7 +660,8 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp, struct bcm_mini_
|
|
}
|
|
}
|
|
|
|
|
|
if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {
|
|
if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {
|
|
- bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
|
|
|
|
|
|
+ bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
|
|
|
|
+ (PUINT)ucResetValue, sizeof(UINT));
|
|
|
|
|
|
if (bytes < 0) {
|
|
if (bytes < 0) {
|
|
Status = bytes;
|
|
Status = bytes;
|
|
@@ -651,22 +673,26 @@ static int bcm_char_ioctl_gpio_multi_request(void __user *argp, struct bcm_mini_
|
|
}
|
|
}
|
|
|
|
|
|
pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
|
|
pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
|
|
- pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
|
|
|
|
|
|
+ pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
|
|
}
|
|
}
|
|
|
|
|
|
- Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_info, IoBuffer.OutputLength);
|
|
|
|
|
|
+ Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_info,
|
|
|
|
+ IoBuffer.OutputLength);
|
|
if (Status) {
|
|
if (Status) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
- "Failed while copying Content to IOBufer for user space err:%d", Status);
|
|
|
|
|
|
+ "Failed while copying Content to IOBufer for user space err:%d",
|
|
|
|
+ Status);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_gpio_mode_request(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_gpio_mode_request(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_gpio_multi_mode gpio_multi_mode[MAX_IDX];
|
|
struct bcm_gpio_multi_mode gpio_multi_mode[MAX_IDX];
|
|
- struct bcm_gpio_multi_mode *pgpio_multi_mode = (struct bcm_gpio_multi_mode *)gpio_multi_mode;
|
|
|
|
|
|
+ struct bcm_gpio_multi_mode *pgpio_multi_mode =
|
|
|
|
+ (struct bcm_gpio_multi_mode *)gpio_multi_mode;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
UCHAR ucResetValue[4];
|
|
UCHAR ucResetValue[4];
|
|
INT Status;
|
|
INT Status;
|
|
@@ -685,24 +711,29 @@ static int bcm_char_ioctl_gpio_mode_request(void __user *argp, struct bcm_mini_a
|
|
if (IoBuffer.OutputLength > sizeof(gpio_multi_mode))
|
|
if (IoBuffer.OutputLength > sizeof(gpio_multi_mode))
|
|
IoBuffer.OutputLength = sizeof(gpio_multi_mode);
|
|
IoBuffer.OutputLength = sizeof(gpio_multi_mode);
|
|
|
|
|
|
- if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))
|
|
|
|
|
|
+ if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- 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) {
|
|
if (bytes < 0) {
|
|
Status = bytes;
|
|
Status = bytes;
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Read of GPIO_MODE_REGISTER failed");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Read of GPIO_MODE_REGISTER failed");
|
|
return Status;
|
|
return Status;
|
|
} else {
|
|
} else {
|
|
Status = STATUS_SUCCESS;
|
|
Status = STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
/* Validating the request */
|
|
/* Validating the request */
|
|
- if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == false) {
|
|
|
|
|
|
+ if (IsReqGpioIsLedInNVM(Adapter,
|
|
|
|
+ pgpio_multi_mode[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>!!!",
|
|
"Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
|
|
- pgpio_multi_mode[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
|
|
|
|
|
|
+ pgpio_multi_mode[WIMAX_IDX].uiGPIOMask,
|
|
|
|
+ Adapter->gpioBitMap);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -720,10 +751,12 @@ static int bcm_char_ioctl_gpio_mode_request(void __user *argp, struct bcm_mini_a
|
|
*/
|
|
*/
|
|
pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
|
|
pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
|
|
|
|
|
|
- Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(ULONG));
|
|
|
|
|
|
+ Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER,
|
|
|
|
+ (PUINT)ucResetValue, sizeof(ULONG));
|
|
if (Status == STATUS_SUCCESS) {
|
|
if (Status == STATUS_SUCCESS) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
- "WRM to GPIO_MODE_REGISTER Done");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "WRM to GPIO_MODE_REGISTER Done");
|
|
} else {
|
|
} else {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
"WRM to GPIO_MODE_REGISTER Failed");
|
|
"WRM to GPIO_MODE_REGISTER Failed");
|
|
@@ -734,16 +767,19 @@ static int bcm_char_ioctl_gpio_mode_request(void __user *argp, struct bcm_mini_a
|
|
pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
|
|
pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
|
|
}
|
|
}
|
|
|
|
|
|
- Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_mode, IoBuffer.OutputLength);
|
|
|
|
|
|
+ Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_mode,
|
|
|
|
+ IoBuffer.OutputLength);
|
|
if (Status) {
|
|
if (Status) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
- "Failed while copying Content to IOBufer for user space err:%d", Status);
|
|
|
|
|
|
+ "Failed while copying Content to IOBufer for user space err:%d",
|
|
|
|
+ Status);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_misc_request(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_misc_request(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
PVOID pvBuffer = NULL;
|
|
PVOID pvBuffer = NULL;
|
|
@@ -766,8 +802,8 @@ static int bcm_char_ioctl_misc_request(void __user *argp, struct bcm_mini_adapte
|
|
|
|
|
|
down(&Adapter->LowPowerModeSync);
|
|
down(&Adapter->LowPowerModeSync);
|
|
Status = wait_event_interruptible_timeout(Adapter->lowpower_mode_wait_queue,
|
|
Status = wait_event_interruptible_timeout(Adapter->lowpower_mode_wait_queue,
|
|
- !Adapter->bPreparingForLowPowerMode,
|
|
|
|
- (1 * HZ));
|
|
|
|
|
|
+ !Adapter->bPreparingForLowPowerMode,
|
|
|
|
+ (1 * HZ));
|
|
if (Status == -ERESTARTSYS)
|
|
if (Status == -ERESTARTSYS)
|
|
goto cntrlEnd;
|
|
goto cntrlEnd;
|
|
|
|
|
|
@@ -785,7 +821,8 @@ cntrlEnd:
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_buffer_download_start(struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_buffer_download_start(
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
INT Status;
|
|
INT Status;
|
|
|
|
|
|
@@ -796,7 +833,7 @@ static int bcm_char_ioctl_buffer_download_start(struct bcm_mini_adapter *Adapter
|
|
}
|
|
}
|
|
|
|
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
- "Starting the firmware download PID =0x%x!!!!\n", current->pid);
|
|
|
|
|
|
+ "Starting the firmware download PID =0x%x!!!!\n", current->pid);
|
|
|
|
|
|
if (down_trylock(&Adapter->fw_download_sema))
|
|
if (down_trylock(&Adapter->fw_download_sema))
|
|
return -EBUSY;
|
|
return -EBUSY;
|
|
@@ -820,13 +857,15 @@ static int bcm_char_ioctl_buffer_download_start(struct bcm_mini_adapter *Adapter
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_buffer_download(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_buffer_download(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_firmware_info *psFwInfo = NULL;
|
|
struct bcm_firmware_info *psFwInfo = NULL;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status;
|
|
INT Status;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Starting the firmware download PID =0x%x!!!!\n", current->pid);
|
|
|
|
|
|
if (!down_trylock(&Adapter->fw_download_sema)) {
|
|
if (!down_trylock(&Adapter->fw_download_sema)) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
@@ -855,7 +894,8 @@ static int bcm_char_ioctl_buffer_download(void __user *argp, struct bcm_mini_ada
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
|
|
|
|
- if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength)) {
|
|
|
|
|
|
+ if (copy_from_user(psFwInfo, IoBuffer.InputBuffer,
|
|
|
|
+ IoBuffer.InputLength)) {
|
|
up(&Adapter->fw_download_sema);
|
|
up(&Adapter->fw_download_sema);
|
|
kfree(psFwInfo);
|
|
kfree(psFwInfo);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -864,7 +904,8 @@ static int bcm_char_ioctl_buffer_download(void __user *argp, struct bcm_mini_ada
|
|
if (!psFwInfo->pvMappedFirmwareAddress ||
|
|
if (!psFwInfo->pvMappedFirmwareAddress ||
|
|
(psFwInfo->u32FirmwareLength == 0)) {
|
|
(psFwInfo->u32FirmwareLength == 0)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Something else is wrong %lu\n",
|
|
psFwInfo->u32FirmwareLength);
|
|
psFwInfo->u32FirmwareLength);
|
|
up(&Adapter->fw_download_sema);
|
|
up(&Adapter->fw_download_sema);
|
|
kfree(psFwInfo);
|
|
kfree(psFwInfo);
|
|
@@ -876,13 +917,16 @@ static int bcm_char_ioctl_buffer_download(void __user *argp, struct bcm_mini_ada
|
|
|
|
|
|
if (Status != STATUS_SUCCESS) {
|
|
if (Status != STATUS_SUCCESS) {
|
|
if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
|
|
if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "IOCTL: Configuration File Upload Failed\n");
|
|
else
|
|
else
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "IOCTL: Firmware File Upload Failed\n");
|
|
|
|
|
|
/* up(&Adapter->fw_download_sema); */
|
|
/* up(&Adapter->fw_download_sema); */
|
|
|
|
|
|
- if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
|
|
|
|
|
|
+ if (Adapter->LEDInfo.led_thread_running &
|
|
|
|
+ BCM_LED_THREAD_RUNNING_ACTIVELY) {
|
|
Adapter->DriverState = DRIVER_INIT;
|
|
Adapter->DriverState = DRIVER_INIT;
|
|
Adapter->LEDInfo.bLedInitDone = false;
|
|
Adapter->LEDInfo.bLedInitDone = false;
|
|
wake_up(&Adapter->LEDInfo.notify_led_event);
|
|
wake_up(&Adapter->LEDInfo.notify_led_event);
|
|
@@ -892,12 +936,14 @@ static int bcm_char_ioctl_buffer_download(void __user *argp, struct bcm_mini_ada
|
|
if (Status != STATUS_SUCCESS)
|
|
if (Status != STATUS_SUCCESS)
|
|
up(&Adapter->fw_download_sema);
|
|
up(&Adapter->fw_download_sema);
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL: Firmware File Uploaded\n");
|
|
kfree(psFwInfo);
|
|
kfree(psFwInfo);
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_buffer_download_stop(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_buffer_download_stop(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
INT Status;
|
|
INT Status;
|
|
int timeout = 0;
|
|
int timeout = 0;
|
|
@@ -924,7 +970,8 @@ static int bcm_char_ioctl_buffer_download_stop(void __user *argp, struct bcm_min
|
|
Status = run_card_proc(Adapter);
|
|
Status = run_card_proc(Adapter);
|
|
|
|
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Firm Download Failed\n");
|
|
up(&Adapter->fw_download_sema);
|
|
up(&Adapter->fw_download_sema);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
return Status;
|
|
return Status;
|
|
@@ -937,7 +984,8 @@ static int bcm_char_ioctl_buffer_download_stop(void __user *argp, struct bcm_min
|
|
|
|
|
|
/* Wait for MailBox Interrupt */
|
|
/* Wait for MailBox Interrupt */
|
|
if (StartInterruptUrb((struct bcm_interface_adapter *)Adapter->pvInterfaceAdapter))
|
|
if (StartInterruptUrb((struct bcm_interface_adapter *)Adapter->pvInterfaceAdapter))
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Unable to send interrupt...\n");
|
|
|
|
|
|
timeout = 5*HZ;
|
|
timeout = 5*HZ;
|
|
Adapter->waiting_to_fw_download_done = false;
|
|
Adapter->waiting_to_fw_download_done = false;
|
|
@@ -952,7 +1000,8 @@ static int bcm_char_ioctl_buffer_download_stop(void __user *argp, struct bcm_min
|
|
Adapter->LinkUpStatus = 0;
|
|
Adapter->LinkUpStatus = 0;
|
|
Adapter->LinkStatus = 0;
|
|
Adapter->LinkStatus = 0;
|
|
|
|
|
|
- if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
|
|
|
|
|
|
+ if (Adapter->LEDInfo.led_thread_running &
|
|
|
|
+ BCM_LED_THREAD_RUNNING_ACTIVELY) {
|
|
Adapter->DriverState = FW_DOWNLOAD_DONE;
|
|
Adapter->DriverState = FW_DOWNLOAD_DONE;
|
|
wake_up(&Adapter->LEDInfo.notify_led_event);
|
|
wake_up(&Adapter->LEDInfo.notify_led_event);
|
|
}
|
|
}
|
|
@@ -972,7 +1021,8 @@ static int bcm_char_ioctl_chip_reset(struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
|
|
NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
|
|
if (NVMAccess) {
|
|
if (NVMAccess) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, " IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ " IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -985,7 +1035,8 @@ static int bcm_char_ioctl_chip_reset(struct bcm_mini_adapter *Adapter)
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_qos_threshold(ULONG arg, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_qos_threshold(ULONG arg,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
USHORT uiLoopIndex;
|
|
USHORT uiLoopIndex;
|
|
|
|
|
|
@@ -998,7 +1049,8 @@ static int bcm_char_ioctl_qos_threshold(ULONG arg, struct bcm_mini_adapter *Adap
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_switch_transfer_mode(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_switch_transfer_mode(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
UINT uiData = 0;
|
|
UINT uiData = 0;
|
|
|
|
|
|
@@ -1007,11 +1059,13 @@ static int bcm_char_ioctl_switch_transfer_mode(void __user *argp, struct bcm_min
|
|
|
|
|
|
if (uiData) {
|
|
if (uiData) {
|
|
/* Allow All Packets */
|
|
/* Allow All Packets */
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SWITCH_TRANSFER_MODE: ETH_PACKET_TUNNELING_MODE\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_SWITCH_TRANSFER_MODE: ETH_PACKET_TUNNELING_MODE\n");
|
|
Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
|
|
Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
|
|
} else {
|
|
} else {
|
|
/* Allow IP only Packets */
|
|
/* Allow IP only Packets */
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SWITCH_TRANSFER_MODE: IP_PACKET_ONLY_MODE\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_SWITCH_TRANSFER_MODE: IP_PACKET_ONLY_MODE\n");
|
|
Adapter->TransferMode = IP_PACKET_ONLY_MODE;
|
|
Adapter->TransferMode = IP_PACKET_ONLY_MODE;
|
|
}
|
|
}
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
@@ -1034,14 +1088,16 @@ static int bcm_char_ioctl_get_driver_version(void __user *argp)
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_get_current_status(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_get_current_status(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_link_state link_state;
|
|
struct bcm_link_state link_state;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
|
|
|
|
/* Copy Ioctl Buffer structure */
|
|
/* Copy Ioctl Buffer structure */
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user failed..\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "copy_from_user failed..\n");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1053,15 +1109,18 @@ static int bcm_char_ioctl_get_current_status(void __user *argp, struct bcm_mini_
|
|
link_state.bShutdownMode = Adapter->bShutStatus;
|
|
link_state.bShutdownMode = Adapter->bShutStatus;
|
|
link_state.ucLinkStatus = Adapter->LinkStatus;
|
|
link_state.ucLinkStatus = Adapter->LinkStatus;
|
|
|
|
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, &link_state, min_t(size_t, sizeof(link_state), IoBuffer.OutputLength))) {
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy_to_user Failed..\n");
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer, &link_state, min_t(size_t,
|
|
|
|
+ sizeof(link_state), IoBuffer.OutputLength))) {
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy_to_user Failed..\n");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-static int bcm_char_ioctl_set_mac_tracing(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_set_mac_tracing(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
UINT tracing_flag;
|
|
UINT tracing_flag;
|
|
@@ -1081,7 +1140,8 @@ static int bcm_char_ioctl_set_mac_tracing(void __user *argp, struct bcm_mini_ada
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_get_dsx_indication(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_get_dsx_indication(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
ULONG ulSFId = 0;
|
|
ULONG ulSFId = 0;
|
|
@@ -1091,20 +1151,23 @@ static int bcm_char_ioctl_get_dsx_indication(void __user *argp, struct bcm_mini_
|
|
|
|
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_add_indication_alt)) {
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_add_indication_alt)) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
- "Mismatch req: %lx needed is =0x%zx!!!",
|
|
|
|
- IoBuffer.OutputLength, sizeof(struct bcm_add_indication_alt));
|
|
|
|
|
|
+ "Mismatch req: %lx needed is =0x%zx!!!",
|
|
|
|
+ IoBuffer.OutputLength,
|
|
|
|
+ sizeof(struct bcm_add_indication_alt));
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
if (copy_from_user(&ulSFId, IoBuffer.InputBuffer, sizeof(ulSFId)))
|
|
if (copy_from_user(&ulSFId, IoBuffer.InputBuffer, sizeof(ulSFId)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Get DSX Data SF ID is =%lx\n", ulSFId);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Get DSX Data SF ID is =%lx\n", ulSFId);
|
|
get_dsx_sf_data_to_application(Adapter, ulSFId, IoBuffer.OutputBuffer);
|
|
get_dsx_sf_data_to_application(Adapter, ulSFId, IoBuffer.OutputBuffer);
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_get_host_mibs(void __user *argp, struct bcm_mini_adapter *Adapter, struct bcm_tarang_data *pTarang)
|
|
|
|
|
|
+static int bcm_char_ioctl_get_host_mibs(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter, struct bcm_tarang_data *pTarang)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
@@ -1115,8 +1178,8 @@ static int bcm_char_ioctl_get_host_mibs(void __user *argp, struct bcm_mini_adapt
|
|
|
|
|
|
if (IoBuffer.OutputLength != sizeof(struct bcm_host_stats_mibs)) {
|
|
if (IoBuffer.OutputLength != sizeof(struct bcm_host_stats_mibs)) {
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
- "Length Check failed %lu %zd\n",
|
|
|
|
- IoBuffer.OutputLength, sizeof(struct bcm_host_stats_mibs));
|
|
|
|
|
|
+ "Length Check failed %lu %zd\n", IoBuffer.OutputLength,
|
|
|
|
+ sizeof(struct bcm_host_stats_mibs));
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1129,7 +1192,8 @@ static int bcm_char_ioctl_get_host_mibs(void __user *argp, struct bcm_mini_adapt
|
|
GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
|
|
GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
|
|
|
|
|
|
if (Status != STATUS_FAILURE) {
|
|
if (Status != STATUS_FAILURE) {
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(struct bcm_host_stats_mibs))) {
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer, temp_buff,
|
|
|
|
+ sizeof(struct bcm_host_stats_mibs))) {
|
|
kfree(temp_buff);
|
|
kfree(temp_buff);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
@@ -1139,7 +1203,8 @@ static int bcm_char_ioctl_get_host_mibs(void __user *argp, struct bcm_mini_adapt
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_bulk_wrm(void __user *argp, struct bcm_mini_adapter *Adapter, UINT cmd)
|
|
|
|
|
|
+static int bcm_char_ioctl_bulk_wrm(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter, UINT cmd)
|
|
{
|
|
{
|
|
struct bcm_bulk_wrm_buffer *pBulkBuffer;
|
|
struct bcm_bulk_wrm_buffer *pBulkBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -1151,7 +1216,8 @@ static int bcm_char_ioctl_bulk_wrm(void __user *argp, struct bcm_mini_adapter *A
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "Device in Idle/Shutdown Mode, Blocking Wrms\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Device in Idle/Shutdown Mode, Blocking Wrms\n");
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1171,7 +1237,9 @@ static int bcm_char_ioctl_bulk_wrm(void __user *argp, struct bcm_mini_adapter *A
|
|
|
|
|
|
if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
|
|
if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
|
|
((ULONG)pBulkBuffer->Register & 0x3)) {
|
|
((ULONG)pBulkBuffer->Register & 0x3)) {
|
|
- BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM Done On invalid Address : %x Access Denied.\n", (int)pBulkBuffer->Register);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "WRM Done On invalid Address : %x Access Denied.\n",
|
|
|
|
+ (int)pBulkBuffer->Register);
|
|
kfree(pvBuffer);
|
|
kfree(pvBuffer);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
@@ -1185,14 +1253,19 @@ static int bcm_char_ioctl_bulk_wrm(void __user *argp, struct bcm_mini_adapter *A
|
|
(cmd == IOCTL_BCM_REGISTER_WRITE)) {
|
|
(cmd == IOCTL_BCM_REGISTER_WRITE)) {
|
|
|
|
|
|
kfree(pvBuffer);
|
|
kfree(pvBuffer);
|
|
- 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;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
if (pBulkBuffer->SwapEndian == false)
|
|
if (pBulkBuffer->SwapEndian == false)
|
|
- Status = wrmWithLock(Adapter, (UINT)pBulkBuffer->Register, (PCHAR)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
|
|
|
|
|
|
+ Status = wrmWithLock(Adapter, (UINT)pBulkBuffer->Register,
|
|
|
|
+ (PCHAR)pBulkBuffer->Values,
|
|
|
|
+ IoBuffer.InputLength - 2*sizeof(ULONG));
|
|
else
|
|
else
|
|
- Status = wrmaltWithLock(Adapter, (UINT)pBulkBuffer->Register, (PUINT)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
|
|
|
|
|
|
+ Status = wrmaltWithLock(Adapter, (UINT)pBulkBuffer->Register,
|
|
|
|
+ (PUINT)pBulkBuffer->Values,
|
|
|
|
+ IoBuffer.InputLength - 2*sizeof(ULONG));
|
|
|
|
|
|
if (Status != STATUS_SUCCESS)
|
|
if (Status != STATUS_SUCCESS)
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n");
|
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n");
|
|
@@ -1201,7 +1274,8 @@ static int bcm_char_ioctl_bulk_wrm(void __user *argp, struct bcm_mini_adapter *A
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_get_nvm_size(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_get_nvm_size(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
|
|
|
|
@@ -1209,42 +1283,52 @@ static int bcm_char_ioctl_get_nvm_size(void __user *argp, struct bcm_mini_adapte
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
if (Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH) {
|
|
if (Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH) {
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize, sizeof(UINT)))
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize,
|
|
|
|
+ sizeof(UINT)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_cal_init(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_cal_init(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
UINT uiSectorSize = 0;
|
|
UINT uiSectorSize = 0;
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
|
|
|
|
if (Adapter->eNVMType == NVM_FLASH) {
|
|
if (Adapter->eNVMType == NVM_FLASH) {
|
|
- if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
|
|
|
|
+ if (copy_from_user(&IoBuffer, argp,
|
|
|
|
+ sizeof(struct bcm_ioctl_buffer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(UINT)))
|
|
|
|
|
|
+ if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer,
|
|
|
|
+ sizeof(UINT)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- if ((uiSectorSize < MIN_SECTOR_SIZE) || (uiSectorSize > MAX_SECTOR_SIZE)) {
|
|
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize,
|
|
|
|
- sizeof(UINT)))
|
|
|
|
|
|
+ if ((uiSectorSize < MIN_SECTOR_SIZE) ||
|
|
|
|
+ (uiSectorSize > MAX_SECTOR_SIZE)) {
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer,
|
|
|
|
+ &Adapter->uiSectorSize, sizeof(UINT)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
} else {
|
|
} else {
|
|
if (IsFlash2x(Adapter)) {
|
|
if (IsFlash2x(Adapter)) {
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize, sizeof(UINT)))
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer,
|
|
|
|
+ &Adapter->uiSectorSize, sizeof(UINT)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
} else {
|
|
} else {
|
|
- if ((TRUE == Adapter->bShutStatus) || (TRUE == Adapter->IdleMode)) {
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ if ((TRUE == Adapter->bShutStatus) ||
|
|
|
|
+ (TRUE == Adapter->IdleMode)) {
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
|
|
Adapter->uiSectorSize = uiSectorSize;
|
|
Adapter->uiSectorSize = uiSectorSize;
|
|
- BcmUpdateSectorSize(Adapter, Adapter->uiSectorSize);
|
|
|
|
|
|
+ BcmUpdateSectorSize(Adapter,
|
|
|
|
+ Adapter->uiSectorSize);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Status = STATUS_SUCCESS;
|
|
Status = STATUS_SUCCESS;
|
|
@@ -1254,24 +1338,29 @@ static int bcm_char_ioctl_cal_init(void __user *argp, struct bcm_mini_adapter *A
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_set_debug(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_set_debug(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
#ifdef DEBUG
|
|
#ifdef DEBUG
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_user_debug_state sUserDebugState;
|
|
struct bcm_user_debug_state sUserDebugState;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In SET_DEBUG ioctl\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "In SET_DEBUG ioctl\n");
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(struct bcm_user_debug_state)))
|
|
|
|
|
|
+ if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer,
|
|
|
|
+ sizeof(struct bcm_user_debug_state)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",
|
|
|
|
|
|
+ BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",
|
|
sUserDebugState.OnOff, sUserDebugState.Type);
|
|
sUserDebugState.OnOff, sUserDebugState.Type);
|
|
/* sUserDebugState.Subtype <<= 1; */
|
|
/* sUserDebugState.Subtype <<= 1; */
|
|
sUserDebugState.Subtype = 1 << sUserDebugState.Subtype;
|
|
sUserDebugState.Subtype = 1 << sUserDebugState.Subtype;
|
|
- BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "actual Subtype=0x%x\n", sUserDebugState.Subtype);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "actual Subtype=0x%x\n", sUserDebugState.Subtype);
|
|
|
|
|
|
/* Update new 'DebugState' in the Adapter */
|
|
/* Update new 'DebugState' in the Adapter */
|
|
Adapter->stDebugState.type |= sUserDebugState.Type;
|
|
Adapter->stDebugState.type |= sUserDebugState.Type;
|
|
@@ -1281,16 +1370,19 @@ static int bcm_char_ioctl_set_debug(void __user *argp, struct bcm_mini_adapter *
|
|
* as the index value, ignoring the array entries 0,3,5,6,7 !
|
|
* as the index value, ignoring the array entries 0,3,5,6,7 !
|
|
*/
|
|
*/
|
|
if (sUserDebugState.OnOff)
|
|
if (sUserDebugState.OnOff)
|
|
- Adapter->stDebugState.subtype[sUserDebugState.Type] |= sUserDebugState.Subtype;
|
|
|
|
|
|
+ Adapter->stDebugState.subtype[sUserDebugState.Type] |=
|
|
|
|
+ sUserDebugState.Subtype;
|
|
else
|
|
else
|
|
- Adapter->stDebugState.subtype[sUserDebugState.Type] &= ~sUserDebugState.Subtype;
|
|
|
|
|
|
+ Adapter->stDebugState.subtype[sUserDebugState.Type] &=
|
|
|
|
+ ~sUserDebugState.Subtype;
|
|
|
|
|
|
BCM_SHOW_DEBUG_BITMAP(Adapter);
|
|
BCM_SHOW_DEBUG_BITMAP(Adapter);
|
|
#endif
|
|
#endif
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Adapter, UINT cmd)
|
|
|
|
|
|
+static int bcm_char_ioctl_nvm_rw(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter, UINT cmd)
|
|
{
|
|
{
|
|
struct bcm_nvm_readwrite stNVMReadWrite;
|
|
struct bcm_nvm_readwrite stNVMReadWrite;
|
|
struct timeval tv0, tv1;
|
|
struct timeval tv0, tv1;
|
|
@@ -1301,8 +1393,10 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
|
|
|
|
memset(&tv0, 0, sizeof(struct timeval));
|
|
memset(&tv0, 0, sizeof(struct timeval));
|
|
memset(&tv1, 0, sizeof(struct timeval));
|
|
memset(&tv1, 0, sizeof(struct timeval));
|
|
- if ((Adapter->eNVMType == NVM_FLASH) && (Adapter->uiFlashLayoutMajorVersion == 0)) {
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "The Flash Control Section is Corrupted. Hence Rejection on NVM Read/Write\n");
|
|
|
|
|
|
+ if ((Adapter->eNVMType == NVM_FLASH) &&
|
|
|
|
+ (Adapter->uiFlashLayoutMajorVersion == 0)) {
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "The Flash Control Section is Corrupted. Hence Rejection on NVM Read/Write\n");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1311,7 +1405,8 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
(Adapter->eActiveDSD != DSD1) &&
|
|
(Adapter->eActiveDSD != DSD1) &&
|
|
(Adapter->eActiveDSD != DSD2)) {
|
|
(Adapter->eActiveDSD != DSD2)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No DSD is active..hence NVM Command is blocked");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "No DSD is active..hence NVM Command is blocked");
|
|
return STATUS_FAILURE;
|
|
return STATUS_FAILURE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1321,7 +1416,8 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
if (copy_from_user(&stNVMReadWrite,
|
|
if (copy_from_user(&stNVMReadWrite,
|
|
- (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
|
|
|
|
|
|
+ (IOCTL_BCM_NVM_READ == cmd) ?
|
|
|
|
+ IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
|
|
sizeof(struct bcm_nvm_readwrite)))
|
|
sizeof(struct bcm_nvm_readwrite)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
@@ -1331,7 +1427,8 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
if (stNVMReadWrite.uiNumBytes > Adapter->uiNVMDSDSize)
|
|
if (stNVMReadWrite.uiNumBytes > Adapter->uiNVMDSDSize)
|
|
return STATUS_FAILURE;
|
|
return STATUS_FAILURE;
|
|
|
|
|
|
- if (stNVMReadWrite.uiOffset > Adapter->uiNVMDSDSize - stNVMReadWrite.uiNumBytes) {
|
|
|
|
|
|
+ if (stNVMReadWrite.uiOffset >
|
|
|
|
+ Adapter->uiNVMDSDSize - stNVMReadWrite.uiNumBytes) {
|
|
/* BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Can't allow access beyond NVM Size: 0x%x 0x%x\n", stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes); */
|
|
/* BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Can't allow access beyond NVM Size: 0x%x 0x%x\n", stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes); */
|
|
return STATUS_FAILURE;
|
|
return STATUS_FAILURE;
|
|
}
|
|
}
|
|
@@ -1349,13 +1446,16 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadData);
|
|
kfree(pReadData);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
|
|
- Status = BeceemNVMRead(Adapter, (PUINT)pReadData, stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes);
|
|
|
|
|
|
+ Status = BeceemNVMRead(Adapter, (PUINT)pReadData,
|
|
|
|
+ stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
|
|
|
|
if (Status != STATUS_SUCCESS) {
|
|
if (Status != STATUS_SUCCESS) {
|
|
@@ -1363,7 +1463,8 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
- if (copy_to_user(stNVMReadWrite.pBuffer, pReadData, stNVMReadWrite.uiNumBytes)) {
|
|
|
|
|
|
+ if (copy_to_user(stNVMReadWrite.pBuffer, pReadData,
|
|
|
|
+ stNVMReadWrite.uiNumBytes)) {
|
|
kfree(pReadData);
|
|
kfree(pReadData);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
@@ -1374,7 +1475,9 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadData);
|
|
kfree(pReadData);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
@@ -1383,31 +1486,42 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
Adapter->bHeaderChangeAllowed = TRUE;
|
|
Adapter->bHeaderChangeAllowed = TRUE;
|
|
if (IsFlash2x(Adapter)) {
|
|
if (IsFlash2x(Adapter)) {
|
|
/*
|
|
/*
|
|
- * New Requirement:-
|
|
|
|
- * DSD section updation will be allowed in two case:-
|
|
|
|
- * 1. if DSD sig is present in DSD header means dongle is ok and updation is fruitfull
|
|
|
|
- * 2. if point 1 failes then user buff should have DSD sig. this point ensures that if dongle is
|
|
|
|
- * corrupted then user space program first modify the DSD header with valid DSD sig so
|
|
|
|
- * that this as well as further write may be worthwhile.
|
|
|
|
|
|
+ * New Requirement:-
|
|
|
|
+ * DSD section updation will be allowed in two case:-
|
|
|
|
+ * 1. if DSD sig is present in DSD header means dongle
|
|
|
|
+ * is ok and updation is fruitfull
|
|
|
|
+ * 2. if point 1 failes then user buff should have
|
|
|
|
+ * DSD sig. this point ensures that if dongle is
|
|
|
|
+ * corrupted then user space program first modify
|
|
|
|
+ * the DSD header with valid DSD sig so that this
|
|
|
|
+ * as well as further write may be worthwhile.
|
|
*
|
|
*
|
|
- * This restriction has been put assuming that if DSD sig is corrupted, DSD
|
|
|
|
- * data won't be considered valid.
|
|
|
|
|
|
+ * This restriction has been put assuming that
|
|
|
|
+ * if DSD sig is corrupted, DSD data won't be
|
|
|
|
+ * considered valid.
|
|
*/
|
|
*/
|
|
|
|
|
|
- Status = BcmFlash2xCorruptSig(Adapter, Adapter->eActiveDSD);
|
|
|
|
|
|
+ Status = BcmFlash2xCorruptSig(Adapter,
|
|
|
|
+ Adapter->eActiveDSD);
|
|
if (Status != STATUS_SUCCESS) {
|
|
if (Status != STATUS_SUCCESS) {
|
|
- if (((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) != Adapter->uiNVMDSDSize) ||
|
|
|
|
|
|
+ if (((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) !=
|
|
|
|
+ Adapter->uiNVMDSDSize) ||
|
|
(stNVMReadWrite.uiNumBytes < SIGNATURE_SIZE)) {
|
|
(stNVMReadWrite.uiNumBytes < SIGNATURE_SIZE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DSD Sig is present neither in Flash nor User provided Input..");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
|
|
|
|
+ OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "DSD Sig is present neither in Flash nor User provided Input..");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadData);
|
|
kfree(pReadData);
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
ulDSDMagicNumInUsrBuff = ntohl(*(PUINT)(pReadData + stNVMReadWrite.uiNumBytes - SIGNATURE_SIZE));
|
|
ulDSDMagicNumInUsrBuff = ntohl(*(PUINT)(pReadData + stNVMReadWrite.uiNumBytes - SIGNATURE_SIZE));
|
|
- if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DSD Sig is present neither in Flash nor User provided Input..");
|
|
|
|
|
|
+ if (ulDSDMagicNumInUsrBuff !=
|
|
|
|
+ DSD_IMAGE_MAGIC_NUMBER) {
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "DSD Sig is present neither in Flash nor User provided Input..");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadData);
|
|
kfree(pReadData);
|
|
return Status;
|
|
return Status;
|
|
@@ -1415,7 +1529,9 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- Status = BeceemNVMWrite(Adapter, (PUINT)pReadData, stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes, stNVMReadWrite.bVerify);
|
|
|
|
|
|
+ Status = BeceemNVMWrite(Adapter, (PUINT)pReadData,
|
|
|
|
+ stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes,
|
|
|
|
+ stNVMReadWrite.bVerify);
|
|
if (IsFlash2x(Adapter))
|
|
if (IsFlash2x(Adapter))
|
|
BcmFlash2xWriteSig(Adapter, Adapter->eActiveDSD);
|
|
BcmFlash2xWriteSig(Adapter, Adapter->eActiveDSD);
|
|
|
|
|
|
@@ -1430,13 +1546,16 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Ada
|
|
}
|
|
}
|
|
|
|
|
|
do_gettimeofday(&tv1);
|
|
do_gettimeofday(&tv1);
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n", (tv1.tv_sec - tv0.tv_sec)*1000 + (tv1.tv_usec - tv0.tv_usec)/1000);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ " timetaken by Write/read :%ld msec\n",
|
|
|
|
+ (tv1.tv_sec - tv0.tv_sec)*1000 + (tv1.tv_usec - tv0.tv_usec)/1000);
|
|
|
|
|
|
kfree(pReadData);
|
|
kfree(pReadData);
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_flash2x_section_read(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_flash2x_readwrite sFlash2xRead = {0};
|
|
struct bcm_flash2x_readwrite sFlash2xRead = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -1449,24 +1568,33 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_min
|
|
void __user *OutPutBuff;
|
|
void __user *OutPutBuff;
|
|
|
|
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash Does not have 2.x map");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_READ Called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_READ Called");
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
/* Reading FLASH 2.x READ structure */
|
|
/* Reading FLASH 2.x READ structure */
|
|
- if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
|
|
|
|
|
|
+ if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer,
|
|
|
|
+ sizeof(struct bcm_flash2x_readwrite)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xRead.Section);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.offset :%x", sFlash2xRead.offset);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.numOfBytes :%x", sFlash2xRead.numOfBytes);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.bVerify :%x\n", sFlash2xRead.bVerify);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.Section :%x", sFlash2xRead.Section);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.offset :%x", sFlash2xRead.offset);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.numOfBytes :%x", sFlash2xRead.numOfBytes);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.bVerify :%x\n", sFlash2xRead.bVerify);
|
|
|
|
|
|
- /* This was internal to driver for raw read. now it has ben exposed to user space app. */
|
|
|
|
|
|
+ /* This was internal to driver for raw read.
|
|
|
|
+ * now it has ben exposed to user space app.
|
|
|
|
+ */
|
|
if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == false)
|
|
if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == false)
|
|
return STATUS_FAILURE;
|
|
return STATUS_FAILURE;
|
|
|
|
|
|
@@ -1481,7 +1609,8 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_min
|
|
pReadBuff = (PCHAR)kzalloc(BuffSize , GFP_KERNEL);
|
|
pReadBuff = (PCHAR)kzalloc(BuffSize , GFP_KERNEL);
|
|
|
|
|
|
if (pReadBuff == NULL) {
|
|
if (pReadBuff == NULL) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed for Flash 2.x Read Structure");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Memory allocation failed for Flash 2.x Read Structure");
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
down(&Adapter->NVMRdmWrmLock);
|
|
down(&Adapter->NVMRdmWrmLock);
|
|
@@ -1490,7 +1619,8 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_min
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadBuff);
|
|
kfree(pReadBuff);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
@@ -1503,17 +1633,24 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_min
|
|
ReadBytes = NOB;
|
|
ReadBytes = NOB;
|
|
|
|
|
|
/* Reading the data from Flash 2.x */
|
|
/* Reading the data from Flash 2.x */
|
|
- Status = BcmFlash2xBulkRead(Adapter, (PUINT)pReadBuff, sFlash2xRead.Section, ReadOffset, ReadBytes);
|
|
|
|
|
|
+ Status = BcmFlash2xBulkRead(Adapter, (PUINT)pReadBuff,
|
|
|
|
+ sFlash2xRead.Section, ReadOffset, ReadBytes);
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Flash 2x read err with Status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Flash 2x read err with Status :%d",
|
|
|
|
+ Status);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
- BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pReadBuff, ReadBytes);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, pReadBuff, ReadBytes);
|
|
|
|
|
|
Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
|
|
Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy to use failed with status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter,
|
|
|
|
+ DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Copy to use failed with status :%d", Status);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadBuff);
|
|
kfree(pReadBuff);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -1530,7 +1667,8 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_min
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_flash2x_section_write(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_flash2x_section_write(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_flash2x_readwrite sFlash2xWrite = {0};
|
|
struct bcm_flash2x_readwrite sFlash2xWrite = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -1543,29 +1681,40 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp, struct bcm_mi
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
|
|
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash Does not have 2.x map");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
- /* First make this False so that we can enable the Sector Permission Check in BeceemFlashBulkWrite */
|
|
|
|
|
|
+ /* First make this False so that we can enable the Sector
|
|
|
|
+ * Permission Check in BeceemFlashBulkWrite
|
|
|
|
+ */
|
|
Adapter->bAllDSDWriteAllow = false;
|
|
Adapter->bAllDSDWriteAllow = false;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
|
|
|
|
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
/* Reading FLASH 2.x READ structure */
|
|
/* Reading FLASH 2.x READ structure */
|
|
- if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
|
|
|
|
|
|
+ if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer,
|
|
|
|
+ sizeof(struct bcm_flash2x_readwrite)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xWrite.Section);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.offset :%d", sFlash2xWrite.offset);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.numOfBytes :%x", sFlash2xWrite.numOfBytes);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.bVerify :%x\n", sFlash2xWrite.bVerify);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.Section :%x", sFlash2xWrite.Section);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.offset :%d", sFlash2xWrite.offset);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.numOfBytes :%x", sFlash2xWrite.numOfBytes);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\nsFlash2xRead.bVerify :%x\n", sFlash2xWrite.bVerify);
|
|
|
|
|
|
- if ((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1) && (sFlash2xWrite.Section != VSA2)) {
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Only VSA write is allowed");
|
|
|
|
|
|
+ if ((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1)
|
|
|
|
+ && (sFlash2xWrite.Section != VSA2)) {
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Only VSA write is allowed");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1600,7 +1749,8 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp, struct bcm_mi
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pWriteBuff);
|
|
kfree(pWriteBuff);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
@@ -1610,18 +1760,23 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp, struct bcm_mi
|
|
do {
|
|
do {
|
|
Status = copy_from_user(pWriteBuff, InputAddr, WriteBytes);
|
|
Status = copy_from_user(pWriteBuff, InputAddr, WriteBytes);
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to user failed with status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy to user failed with status :%d", Status);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pWriteBuff);
|
|
kfree(pWriteBuff);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
- BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pWriteBuff, WriteBytes);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS,
|
|
|
|
+ OSAL_DBG, DBG_LVL_ALL, pWriteBuff, WriteBytes);
|
|
|
|
|
|
/* Writing the data from Flash 2.x */
|
|
/* Writing the data from Flash 2.x */
|
|
- Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff, sFlash2xWrite.Section, WriteOffset, WriteBytes, sFlash2xWrite.bVerify);
|
|
|
|
|
|
+ Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff,
|
|
|
|
+ sFlash2xWrite.Section, WriteOffset, WriteBytes,
|
|
|
|
+ sFlash2xWrite.bVerify);
|
|
|
|
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash 2x read err with Status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash 2x read err with Status :%d", Status);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1642,13 +1797,15 @@ static int bcm_char_ioctl_flash2x_section_write(void __user *argp, struct bcm_mi
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_flash2x_section_bitmap(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_flash2x_section_bitmap(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_flash2x_bitmap *psFlash2xBitMap;
|
|
struct bcm_flash2x_bitmap *psFlash2xBitMap;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
|
|
|
|
-BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called");
|
|
|
|
|
|
+BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called");
|
|
|
|
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -1658,7 +1815,8 @@ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_
|
|
|
|
|
|
psFlash2xBitMap = kzalloc(sizeof(struct bcm_flash2x_bitmap), GFP_KERNEL);
|
|
psFlash2xBitMap = kzalloc(sizeof(struct bcm_flash2x_bitmap), GFP_KERNEL);
|
|
if (psFlash2xBitMap == NULL) {
|
|
if (psFlash2xBitMap == NULL) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory is not available");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Memory is not available");
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1669,7 +1827,8 @@ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(psFlash2xBitMap);
|
|
kfree(psFlash2xBitMap);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
@@ -1677,7 +1836,8 @@ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_
|
|
|
|
|
|
BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
|
|
BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(struct bcm_flash2x_bitmap))) {
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap,
|
|
|
|
+ sizeof(struct bcm_flash2x_bitmap))) {
|
|
kfree(psFlash2xBitMap);
|
|
kfree(psFlash2xBitMap);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
@@ -1686,28 +1846,34 @@ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_GET_
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_set_active_section(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_set_active_section(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
enum bcm_flash2x_section_val eFlash2xSectionVal = 0;
|
|
enum bcm_flash2x_section_val eFlash2xSectionVal = 0;
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_SET_ACTIVE_SECTION Called");
|
|
|
|
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash Does not have 2.x map");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of IOCTL BUFFER failed");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
- Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
|
|
|
|
|
|
+ Status = copy_from_user(&eFlash2xSectionVal,
|
|
|
|
+ IoBuffer.InputBuffer, sizeof(INT));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of flash section val failed");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1717,63 +1883,82 @@ static int bcm_char_ioctl_set_active_section(void __user *argp, struct bcm_mini_
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
|
|
Status = BcmSetActiveSection(Adapter, eFlash2xSectionVal);
|
|
Status = BcmSetActiveSection(Adapter, eFlash2xSectionVal);
|
|
if (Status)
|
|
if (Status)
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Failed to make it's priority Highest. Status %d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Failed to make it's priority Highest. Status %d",
|
|
|
|
+ Status);
|
|
|
|
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
|
|
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_copy_section(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_copy_section(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_flash2x_copy_section sCopySectStrut = {0};
|
|
struct bcm_flash2x_copy_section sCopySectStrut = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status = STATUS_SUCCESS;
|
|
INT Status = STATUS_SUCCESS;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION Called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_COPY_SECTION Called");
|
|
|
|
|
|
Adapter->bAllDSDWriteAllow = false;
|
|
Adapter->bAllDSDWriteAllow = false;
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash Does not have 2.x map");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of IOCTL BUFFER failed Status :%d", Status);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
- Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_copy_section));
|
|
|
|
|
|
+ Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer,
|
|
|
|
+ sizeof(struct bcm_flash2x_copy_section));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of Copy_Section_Struct failed with Status :%d",
|
|
|
|
+ Status);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source SEction :%x", sCopySectStrut.SrcSection);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Destination SEction :%x", sCopySectStrut.DstSection);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "offset :%x", sCopySectStrut.offset);
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "NOB :%x", sCopySectStrut.numOfBytes);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Source SEction :%x", sCopySectStrut.SrcSection);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Destination SEction :%x", sCopySectStrut.DstSection);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "offset :%x", sCopySectStrut.offset);
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "NOB :%x", sCopySectStrut.numOfBytes);
|
|
|
|
|
|
if (IsSectionExistInFlash(Adapter, sCopySectStrut.SrcSection) == false) {
|
|
if (IsSectionExistInFlash(Adapter, sCopySectStrut.SrcSection) == false) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Source Section<%x> does not exist in Flash ", sCopySectStrut.SrcSection);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Source Section<%x> does not exist in Flash ",
|
|
|
|
+ sCopySectStrut.SrcSection);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
if (IsSectionExistInFlash(Adapter, sCopySectStrut.DstSection) == false) {
|
|
if (IsSectionExistInFlash(Adapter, sCopySectStrut.DstSection) == false) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Destinatio Section<%x> does not exist in Flash ", sCopySectStrut.DstSection);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Destinatio Section<%x> does not exist in Flash ",
|
|
|
|
+ sCopySectStrut.DstSection);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
if (sCopySectStrut.SrcSection == sCopySectStrut.DstSection) {
|
|
if (sCopySectStrut.SrcSection == sCopySectStrut.DstSection) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source and Destination section should be different");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Source and Destination section should be different");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1783,19 +1968,23 @@ static int bcm_char_ioctl_copy_section(void __user *argp, struct bcm_mini_adapte
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Device is in Idle/Shutdown Mode\n");
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
}
|
|
}
|
|
|
|
|
|
- if (sCopySectStrut.SrcSection == ISO_IMAGE1 || sCopySectStrut.SrcSection == ISO_IMAGE2) {
|
|
|
|
|
|
+ if (sCopySectStrut.SrcSection == ISO_IMAGE1 ||
|
|
|
|
+ sCopySectStrut.SrcSection == ISO_IMAGE2) {
|
|
if (IsNonCDLessDevice(Adapter)) {
|
|
if (IsNonCDLessDevice(Adapter)) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Device is Non-CDLess hence won't have ISO !!");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Device is Non-CDLess hence won't have ISO !!");
|
|
Status = -EINVAL;
|
|
Status = -EINVAL;
|
|
} else if (sCopySectStrut.numOfBytes == 0) {
|
|
} else if (sCopySectStrut.numOfBytes == 0) {
|
|
Status = BcmCopyISO(Adapter, sCopySectStrut);
|
|
Status = BcmCopyISO(Adapter, sCopySectStrut);
|
|
} else {
|
|
} else {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Partial Copy of ISO section is not Allowed..");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Partial Copy of ISO section is not Allowed..");
|
|
Status = STATUS_FAILURE;
|
|
Status = STATUS_FAILURE;
|
|
}
|
|
}
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
@@ -1803,26 +1992,32 @@ static int bcm_char_ioctl_copy_section(void __user *argp, struct bcm_mini_adapte
|
|
}
|
|
}
|
|
|
|
|
|
Status = BcmCopySection(Adapter, sCopySectStrut.SrcSection,
|
|
Status = BcmCopySection(Adapter, sCopySectStrut.SrcSection,
|
|
- sCopySectStrut.DstSection, sCopySectStrut.offset, sCopySectStrut.numOfBytes);
|
|
|
|
|
|
+ sCopySectStrut.DstSection,
|
|
|
|
+ sCopySectStrut.offset,
|
|
|
|
+ sCopySectStrut.numOfBytes);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_get_flash_cs_info(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_get_flash_cs_info(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status = STATUS_SUCCESS;
|
|
INT Status = STATUS_SUCCESS;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " IOCTL_BCM_GET_FLASH_CS_INFO Called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ " IOCTL_BCM_GET_FLASH_CS_INFO Called");
|
|
|
|
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of IOCTL BUFFER failed");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
if (Adapter->eNVMType != NVM_FLASH) {
|
|
if (Adapter->eNVMType != NVM_FLASH) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Connected device does not have flash");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Connected device does not have flash");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1830,19 +2025,23 @@ static int bcm_char_ioctl_get_flash_cs_info(void __user *argp, struct bcm_mini_a
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_flash2x_cs_info))
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_flash2x_cs_info))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlash2xCSInfo, sizeof(struct bcm_flash2x_cs_info)))
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer,
|
|
|
|
+ Adapter->psFlash2xCSInfo,
|
|
|
|
+ sizeof(struct bcm_flash2x_cs_info)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
} else {
|
|
} else {
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_flash_cs_info))
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_flash_cs_info))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo, sizeof(struct bcm_flash_cs_info)))
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo,
|
|
|
|
+ sizeof(struct bcm_flash_cs_info)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_select_dsd(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_select_dsd(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
@@ -1850,36 +2049,46 @@ static int bcm_char_ioctl_select_dsd(void __user *argp, struct bcm_mini_adapter
|
|
enum bcm_flash2x_section_val eFlash2xSectionVal;
|
|
enum bcm_flash2x_section_val eFlash2xSectionVal;
|
|
|
|
|
|
eFlash2xSectionVal = NO_SECTION_VAL;
|
|
eFlash2xSectionVal = NO_SECTION_VAL;
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SELECT_DSD Called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_SELECT_DSD Called");
|
|
|
|
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
if (IsFlash2x(Adapter) != TRUE) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash Does not have 2.x map");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of IOCTL BUFFER failed");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
- Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
|
|
|
|
|
|
+ Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer,
|
|
|
|
+ sizeof(INT));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy of flash section val failed");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read Section :%d", eFlash2xSectionVal);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "Read Section :%d", eFlash2xSectionVal);
|
|
if ((eFlash2xSectionVal != DSD0) &&
|
|
if ((eFlash2xSectionVal != DSD0) &&
|
|
(eFlash2xSectionVal != DSD1) &&
|
|
(eFlash2xSectionVal != DSD1) &&
|
|
(eFlash2xSectionVal != DSD2)) {
|
|
(eFlash2xSectionVal != DSD2)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Passed section<%x> is not DSD section", eFlash2xSectionVal);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Passed section<%x> is not DSD section",
|
|
|
|
+ eFlash2xSectionVal);
|
|
return STATUS_FAILURE;
|
|
return STATUS_FAILURE;
|
|
}
|
|
}
|
|
|
|
|
|
SectOfset = BcmGetSectionValStartOffset(Adapter, eFlash2xSectionVal);
|
|
SectOfset = BcmGetSectionValStartOffset(Adapter, eFlash2xSectionVal);
|
|
if (SectOfset == INVALID_OFFSET) {
|
|
if (SectOfset == INVALID_OFFSET) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Provided Section val <%d> does not exist in Flash 2.x", eFlash2xSectionVal);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Provided Section val <%d> does not exist in Flash 2.x",
|
|
|
|
+ eFlash2xSectionVal);
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1890,7 +2099,8 @@ static int bcm_char_ioctl_select_dsd(void __user *argp, struct bcm_mini_adapter
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_nvm_raw_read(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_nvm_readwrite stNVMRead;
|
|
struct bcm_nvm_readwrite stNVMRead;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
@@ -1903,17 +2113,20 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapte
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
|
|
|
|
if (Adapter->eNVMType != NVM_FLASH) {
|
|
if (Adapter->eNVMType != NVM_FLASH) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "NVM TYPE is not Flash");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "NVM TYPE is not Flash");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
|
|
/* Copy Ioctl Buffer structure */
|
|
/* Copy Ioctl Buffer structure */
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user 1 failed\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "copy_from_user 1 failed\n");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
- if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(struct bcm_nvm_readwrite)))
|
|
|
|
|
|
+ if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer,
|
|
|
|
+ sizeof(struct bcm_nvm_readwrite)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
NOB = stNVMRead.uiNumBytes;
|
|
NOB = stNVMRead.uiNumBytes;
|
|
@@ -1929,7 +2142,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapte
|
|
|
|
|
|
pReadBuff = kzalloc(BuffSize , GFP_KERNEL);
|
|
pReadBuff = kzalloc(BuffSize , GFP_KERNEL);
|
|
if (pReadBuff == NULL) {
|
|
if (pReadBuff == NULL) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed for Flash 2.x Read Structure");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Memory allocation failed for Flash 2.x Read Structure");
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
down(&Adapter->NVMRdmWrmLock);
|
|
down(&Adapter->NVMRdmWrmLock);
|
|
@@ -1938,7 +2152,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapte
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bShutStatus == TRUE) ||
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
(Adapter->bPreparingForLowPowerMode == TRUE)) {
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
|
|
kfree(pReadBuff);
|
|
kfree(pReadBuff);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
return -EACCES;
|
|
return -EACCES;
|
|
@@ -1953,17 +2168,21 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapte
|
|
ReadBytes = NOB;
|
|
ReadBytes = NOB;
|
|
|
|
|
|
/* Reading the data from Flash 2.x */
|
|
/* Reading the data from Flash 2.x */
|
|
- Status = BeceemNVMRead(Adapter, (PUINT)pReadBuff, ReadOffset, ReadBytes);
|
|
|
|
|
|
+ Status = BeceemNVMRead(Adapter, (PUINT)pReadBuff,
|
|
|
|
+ ReadOffset, ReadBytes);
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash 2x read err with Status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Flash 2x read err with Status :%d", Status);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
- BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pReadBuff, ReadBytes);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, pReadBuff, ReadBytes);
|
|
|
|
|
|
Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
|
|
Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to use failed with status :%d", Status);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
|
|
|
+ "Copy to use failed with status :%d", Status);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
up(&Adapter->NVMRdmWrmLock);
|
|
kfree(pReadBuff);
|
|
kfree(pReadBuff);
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -1980,7 +2199,8 @@ static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapte
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp, struct bcm_mini_adapter *Adapter, struct bcm_tarang_data *pTarang)
|
|
|
|
|
|
+static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter, struct bcm_tarang_data *pTarang)
|
|
{
|
|
{
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
INT Status = STATUS_FAILURE;
|
|
INT Status = STATUS_FAILURE;
|
|
@@ -1989,30 +2209,37 @@ static int bcm_char_ioctl_cntrlmsg_mask(void __user *argp, struct bcm_mini_adapt
|
|
/* Copy Ioctl Buffer structure */
|
|
/* Copy Ioctl Buffer structure */
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "copy of Ioctl buffer is failed from user space");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
|
|
|
|
if (IoBuffer.InputLength != sizeof(unsigned long))
|
|
if (IoBuffer.InputLength != sizeof(unsigned long))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- Status = copy_from_user(&RxCntrlMsgBitMask, IoBuffer.InputBuffer, IoBuffer.InputLength);
|
|
|
|
|
|
+ Status = copy_from_user(&RxCntrlMsgBitMask,
|
|
|
|
+ IoBuffer.InputBuffer, IoBuffer.InputLength);
|
|
if (Status) {
|
|
if (Status) {
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of control bit mask failed from user space");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "copy of control bit mask failed from user space");
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
}
|
|
}
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\n Got user defined cntrl msg bit mask :%lx", RxCntrlMsgBitMask);
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "\n Got user defined cntrl msg bit mask :%lx",
|
|
|
|
+ RxCntrlMsgBitMask);
|
|
pTarang->RxCntrlMsgBitMask = RxCntrlMsgBitMask;
|
|
pTarang->RxCntrlMsgBitMask = RxCntrlMsgBitMask;
|
|
|
|
|
|
return Status;
|
|
return Status;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_get_device_driver_info(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_get_device_driver_info(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_driver_info DevInfo;
|
|
struct bcm_driver_info DevInfo;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
|
|
|
|
|
|
memset(&DevInfo, 0, sizeof(DevInfo));
|
|
memset(&DevInfo, 0, sizeof(DevInfo));
|
|
DevInfo.MaxRDMBufferSize = BUFFER_4K;
|
|
DevInfo.MaxRDMBufferSize = BUFFER_4K;
|
|
@@ -2033,12 +2260,14 @@ static int bcm_char_ioctl_get_device_driver_info(void __user *argp, struct bcm_m
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
-static int bcm_char_ioctl_time_since_net_entry(void __user *argp, struct bcm_mini_adapter *Adapter)
|
|
|
|
|
|
+static int bcm_char_ioctl_time_since_net_entry(void __user *argp,
|
|
|
|
+ struct bcm_mini_adapter *Adapter)
|
|
{
|
|
{
|
|
struct bcm_time_elapsed stTimeElapsedSinceNetEntry = {0};
|
|
struct bcm_time_elapsed stTimeElapsedSinceNetEntry = {0};
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
struct bcm_ioctl_buffer IoBuffer;
|
|
|
|
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");
|
|
|
|
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -2046,9 +2275,11 @@ static int bcm_char_ioctl_time_since_net_entry(void __user *argp, struct bcm_min
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
|
|
if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;
|
|
|
|
|
|
+ stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry =
|
|
|
|
+ get_seconds() - Adapter->liTimeSinceLastNetEntry;
|
|
|
|
|
|
- if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))
|
|
|
|
|
|
+ if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry,
|
|
|
|
+ sizeof(struct bcm_time_elapsed)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
return STATUS_SUCCESS;
|
|
return STATUS_SUCCESS;
|
|
@@ -2190,7 +2421,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
|
|
break;
|
|
break;
|
|
|
|
|
|
case IOCTL_GET_PACK_INFO:
|
|
case IOCTL_GET_PACK_INFO:
|
|
- if (copy_to_user(argp, &Adapter->PackInfo, sizeof(struct bcm_packet_info)*NO_OF_QUEUES))
|
|
|
|
|
|
+ if (copy_to_user(argp, &Adapter->PackInfo,
|
|
|
|
+ sizeof(struct bcm_packet_info)*NO_OF_QUEUES))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
Status = STATUS_SUCCESS;
|
|
Status = STATUS_SUCCESS;
|
|
break;
|
|
break;
|
|
@@ -2220,7 +2452,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
|
|
return Status;
|
|
return Status;
|
|
|
|
|
|
case IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE:
|
|
case IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE:
|
|
- if ((false == Adapter->bTriedToWakeUpFromlowPowerMode) && (TRUE == Adapter->IdleMode)) {
|
|
|
|
|
|
+ if ((false == Adapter->bTriedToWakeUpFromlowPowerMode) &&
|
|
|
|
+ (TRUE == Adapter->IdleMode)) {
|
|
Adapter->usIdleModePattern = ABORT_IDLE_MODE;
|
|
Adapter->usIdleModePattern = ABORT_IDLE_MODE;
|
|
Adapter->bWakeUpDevice = TRUE;
|
|
Adapter->bWakeUpDevice = TRUE;
|
|
wake_up(&Adapter->process_rx_cntrlpkt);
|
|
wake_up(&Adapter->process_rx_cntrlpkt);
|
|
@@ -2269,7 +2502,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
|
|
case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION:
|
|
case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION:
|
|
/* Right Now we are taking care of only DSD */
|
|
/* Right Now we are taking care of only DSD */
|
|
Adapter->bAllDSDWriteAllow = false;
|
|
Adapter->bAllDSDWriteAllow = false;
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
|
|
|
|
+ "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
|
|
Status = STATUS_SUCCESS;
|
|
Status = STATUS_SUCCESS;
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -2302,7 +2536,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
|
|
return Status;
|
|
return Status;
|
|
|
|
|
|
case IOCTL_CLOSE_NOTIFICATION:
|
|
case IOCTL_CLOSE_NOTIFICATION:
|
|
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION");
|
|
|
|
|
|
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
|
|
|
|
+ DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION");
|
|
break;
|
|
break;
|
|
|
|
|
|
default:
|
|
default:
|