staging/bcm: two information leaks in ioctl
[firefly-linux-kernel-4.4.55.git] / drivers / staging / bcm / Bcmchar.c
index f1b6de0293c8f69d7b205c39fc598be43b86e092..6f1997dc44c8e92f5dea2677f946ff00d10c8959 100644 (file)
@@ -150,1354 +150,1224 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
        return PktLen;
 }
 
-static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
+static int bcm_char_ioctl_reg_read_private(void __user *argp, struct bcm_mini_adapter *Adapter)
 {
-       struct bcm_tarang_data *pTarang = filp->private_data;
-       void __user *argp = (void __user *)arg;
-       struct bcm_mini_adapter *Adapter = pTarang->Adapter;
-       INT Status = STATUS_FAILURE;
-       int timeout = 0;
+       struct bcm_rdm_buffer sRdmBuffer = {0};
        struct bcm_ioctl_buffer IoBuffer;
+       PCHAR temp_buff;
+       INT Status = STATUS_FAILURE;
+       UINT Bufflen;
+       u16 temp_value;
        int bytes;
 
-       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                       "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX",
-                       cmd, arg);
-
-       if (_IOC_TYPE(cmd) != BCM_IOCTL)
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
                return -EFAULT;
-       if (_IOC_DIR(cmd) & _IOC_READ)
-               Status = !access_ok(VERIFY_WRITE, argp, _IOC_SIZE(cmd));
-       else if (_IOC_DIR(cmd) & _IOC_WRITE)
-               Status = !access_ok(VERIFY_READ, argp, _IOC_SIZE(cmd));
-       else if (_IOC_NONE == (_IOC_DIR(cmd) & _IOC_NONE))
-               Status = STATUS_SUCCESS;
 
-       if (Status)
-               return -EFAULT;
+       if (IoBuffer.InputLength > sizeof(sRdmBuffer))
+               return -EINVAL;
 
-       if (Adapter->device_removed)
+       if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
                return -EFAULT;
 
-       if (false == Adapter->fw_download_done) {
-               switch (cmd) {
-               case IOCTL_MAC_ADDR_REQ:
-               case IOCTL_LINK_REQ:
-               case IOCTL_CM_REQUEST:
-               case IOCTL_SS_INFO_REQ:
-               case IOCTL_SEND_CONTROL_MESSAGE:
-               case IOCTL_IDLE_REQ:
-               case IOCTL_BCM_GPIO_SET_REQUEST:
-               case IOCTL_BCM_GPIO_STATUS_REQUEST:
-                       return -EACCES;
-               default:
-                       break;
-               }
+       if (IoBuffer.OutputLength > USHRT_MAX ||
+               IoBuffer.OutputLength == 0) {
+               return -EINVAL;
        }
 
-       Status = vendorextnIoctl(Adapter, cmd, arg);
-       if (Status != CONTINUE_COMMON_PATH)
-               return Status;
-
-       switch (cmd) {
-       /* Rdms for Swin Idle... */
-       case IOCTL_BCM_REGISTER_READ_PRIVATE: {
-               struct bcm_rdm_buffer sRdmBuffer = {0};
-               PCHAR temp_buff;
-               UINT Bufflen;
-               u16 temp_value;
-
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       Bufflen = IoBuffer.OutputLength;
+       temp_value = 4 - (Bufflen % 4);
+       Bufflen += temp_value % 4;
 
-               if (IoBuffer.InputLength > sizeof(sRdmBuffer))
-                       return -EINVAL;
+       temp_buff = kmalloc(Bufflen, GFP_KERNEL);
+       if (!temp_buff)
+               return -ENOMEM;
 
-               if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+       bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
+                       (PUINT)temp_buff, Bufflen);
+       if (bytes > 0) {
+               Status = STATUS_SUCCESS;
+               if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
+                       kfree(temp_buff);
                        return -EFAULT;
-
-               if (IoBuffer.OutputLength > USHRT_MAX ||
-                       IoBuffer.OutputLength == 0) {
-                       return -EINVAL;
                }
+       } else {
+               Status = bytes;
+       }
 
-               Bufflen = IoBuffer.OutputLength;
-               temp_value = 4 - (Bufflen % 4);
-               Bufflen += temp_value % 4;
+       kfree(temp_buff);
+       return Status;
+}
 
-               temp_buff = kmalloc(Bufflen, GFP_KERNEL);
-               if (!temp_buff)
-                       return -ENOMEM;
+static int bcm_char_ioctl_reg_write_private(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_wrm_buffer sWrmBuffer = {0};
+       struct bcm_ioctl_buffer IoBuffer;
+       UINT uiTempVar = 0;
+       INT Status;
 
-               bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
-                               (PUINT)temp_buff, Bufflen);
-               if (bytes > 0) {
-                       Status = STATUS_SUCCESS;
-                       if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
-                               kfree(temp_buff);
-                               return -EFAULT;
-                       }
-               } else {
-                       Status = bytes;
-               }
+       /* Copy Ioctl Buffer structure */
 
-               kfree(temp_buff);
-               break;
-       }
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-       case IOCTL_BCM_REGISTER_WRITE_PRIVATE: {
-               struct bcm_wrm_buffer sWrmBuffer = {0};
-               UINT uiTempVar = 0;
-               /* Copy Ioctl Buffer structure */
+       if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+               return -EINVAL;
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       /* Get WrmBuffer structure */
+       if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               if (IoBuffer.InputLength > sizeof(sWrmBuffer))
-                       return -EINVAL;
+       uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
+       if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
+               ((uiTempVar == EEPROM_REJECT_REG_1) ||
+                       (uiTempVar == EEPROM_REJECT_REG_2) ||
+                       (uiTempVar == EEPROM_REJECT_REG_3) ||
+                       (uiTempVar == EEPROM_REJECT_REG_4))) {
 
-               /* Get WrmBuffer structure */
-               if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "EEPROM Access Denied, not in VSG Mode\n");
+               return -EFAULT;
+       }
 
-               uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
-               if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
-                       ((uiTempVar == EEPROM_REJECT_REG_1) ||
-                               (uiTempVar == EEPROM_REJECT_REG_2) ||
-                               (uiTempVar == EEPROM_REJECT_REG_3) ||
-                               (uiTempVar == EEPROM_REJECT_REG_4))) {
+       Status = wrmalt(Adapter, (UINT)sWrmBuffer.Register,
+                       (PUINT)sWrmBuffer.Data, sizeof(ULONG));
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "EEPROM Access Denied, not in VSG Mode\n");
-                       return -EFAULT;
-               }
+       if (Status == STATUS_SUCCESS) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL, "WRM Done\n");
+       } else {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL, "WRM Failed\n");
+               Status = -EFAULT;
+       }
+       return Status;
+}
 
-               Status = wrmalt(Adapter, (UINT)sWrmBuffer.Register,
-                               (PUINT)sWrmBuffer.Data, sizeof(ULONG));
+static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_rdm_buffer sRdmBuffer = {0};
+       struct bcm_ioctl_buffer IoBuffer;
+       PCHAR temp_buff = NULL;
+       UINT uiTempVar = 0;
+       INT Status;
+       int bytes;
 
-               if (Status == STATUS_SUCCESS) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL, "WRM Done\n");
-               } else {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL, "WRM Failed\n");
-                       Status = -EFAULT;
-               }
-               break;
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
+
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Device in Idle Mode, Blocking Rdms\n");
+               return -EACCES;
        }
 
-       case IOCTL_BCM_REGISTER_READ:
-       case IOCTL_BCM_EEPROM_REGISTER_READ: {
-               struct bcm_rdm_buffer sRdmBuffer = {0};
-               PCHAR temp_buff = NULL;
-               UINT uiTempVar = 0;
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Device in Idle Mode, Blocking Rdms\n");
-                       return -EACCES;
-               }
+       if (IoBuffer.InputLength > sizeof(sRdmBuffer))
+               return -EINVAL;
 
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               if (IoBuffer.InputLength > sizeof(sRdmBuffer))
-                       return -EINVAL;
+       if (IoBuffer.OutputLength > USHRT_MAX ||
+               IoBuffer.OutputLength == 0) {
+               return -EINVAL;
+       }
 
-               if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+       temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
+       if (!temp_buff)
+               return STATUS_FAILURE;
 
-               if (IoBuffer.OutputLength > USHRT_MAX ||
-                       IoBuffer.OutputLength == 0) {
-                       return -EINVAL;
-               }
+       if ((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
+               ((ULONG)sRdmBuffer.Register & 0x3)) {
 
-               temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
-               if (!temp_buff)
-                       return STATUS_FAILURE;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "RDM Done On invalid Address : %x Access Denied.\n",
+                               (int)sRdmBuffer.Register);
 
-               if ((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-                       ((ULONG)sRdmBuffer.Register & 0x3)) {
+               kfree(temp_buff);
+               return -EINVAL;
+       }
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "RDM Done On invalid Address : %x Access Denied.\n",
-                                       (int)sRdmBuffer.Register);
+       uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
+       bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register,
+                              (PUINT)temp_buff, IoBuffer.OutputLength);
 
+       if (bytes > 0) {
+               Status = STATUS_SUCCESS;
+               if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
                        kfree(temp_buff);
-                       return -EINVAL;
+                       return -EFAULT;
                }
+       } else {
+               Status = bytes;
+       }
 
-               uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
-               bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register,
-                                      (PUINT)temp_buff, IoBuffer.OutputLength);
+       kfree(temp_buff);
+       return Status;
+}
 
-               if (bytes > 0) {
-                       Status = STATUS_SUCCESS;
-                       if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
-                               kfree(temp_buff);
-                               return -EFAULT;
-                       }
-               } else {
-                       Status = bytes;
-               }
+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_ioctl_buffer IoBuffer;
+       UINT uiTempVar = 0;
+       INT Status;
 
-               kfree(temp_buff);
-               break;
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
+
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Device in Idle Mode, Blocking Wrms\n");
+               return -EACCES;
        }
-       case IOCTL_BCM_REGISTER_WRITE:
-       case IOCTL_BCM_EEPROM_REGISTER_WRITE: {
-               struct bcm_wrm_buffer sWrmBuffer = {0};
-               UINT uiTempVar = 0;
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Device in Idle Mode, Blocking Wrms\n");
-                       return -EACCES;
-               }
+       if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+               return -EINVAL;
 
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       /* Get WrmBuffer structure */
+       if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               if (IoBuffer.InputLength > sizeof(sWrmBuffer))
-                       return -EINVAL;
+       if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
+               ((ULONG)sWrmBuffer.Register & 0x3)) {
 
-               /* Get WrmBuffer structure */
-               if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "WRM Done On invalid Address : %x Access Denied.\n",
+                               (int)sWrmBuffer.Register);
+               return -EINVAL;
+       }
 
-               if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-                       ((ULONG)sWrmBuffer.Register & 0x3)) {
+       uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
+       if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
+                       ((uiTempVar == EEPROM_REJECT_REG_1) ||
+                       (uiTempVar == EEPROM_REJECT_REG_2) ||
+                       (uiTempVar == EEPROM_REJECT_REG_3) ||
+                       (uiTempVar == EEPROM_REJECT_REG_4)) &&
+                       (cmd == IOCTL_BCM_REGISTER_WRITE)) {
 
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "WRM Done On invalid Address : %x Access Denied.\n",
-                                       (int)sWrmBuffer.Register);
-                       return -EINVAL;
-               }
-
-               uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
-               if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
-                               ((uiTempVar == EEPROM_REJECT_REG_1) ||
-                               (uiTempVar == EEPROM_REJECT_REG_2) ||
-                               (uiTempVar == EEPROM_REJECT_REG_3) ||
-                               (uiTempVar == EEPROM_REJECT_REG_4)) &&
-                               (cmd == IOCTL_BCM_REGISTER_WRITE)) {
-
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                               "EEPROM Access Denied, not in VSG Mode\n");
-                               return -EFAULT;
-               }
+                                       "EEPROM Access Denied, not in VSG Mode\n");
+                       return -EFAULT;
+       }
 
-               Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,
-                                       (PUINT)sWrmBuffer.Data,
-                                       sWrmBuffer.Length);
+       Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,
+                               (PUINT)sWrmBuffer.Data,
+                               sWrmBuffer.Length);
 
-               if (Status == STATUS_SUCCESS) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG,
-                                       DBG_LVL_ALL, "WRM Done\n");
-               } else {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL, "WRM Failed\n");
-                       Status = -EFAULT;
-               }
-               break;
+       if (Status == STATUS_SUCCESS) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG,
+                               DBG_LVL_ALL, "WRM Done\n");
+       } else {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL, "WRM Failed\n");
+               Status = -EFAULT;
        }
-       case IOCTL_BCM_GPIO_SET_REQUEST: {
-               UCHAR ucResetValue[4];
-               UINT value = 0;
-               UINT uiBit = 0;
-               UINT uiOperation = 0;
-               struct bcm_gpio_info gpio_info = {0};
+       return Status;
+}
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+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_ioctl_buffer IoBuffer;
+       UCHAR ucResetValue[4];
+       UINT value = 0;
+       UINT uiBit = 0;
+       UINT uiOperation = 0;
+       INT Status;
+       int bytes;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL,
-                                       "GPIO Can't be set/clear in Low power Mode");
-                       return -EACCES;
-               }
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL,
+                               "GPIO Can't be set/clear in Low power Mode");
+               return -EACCES;
+       }
 
-               if (IoBuffer.InputLength > sizeof(gpio_info))
-                       return -EINVAL;
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               if (copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+       if (IoBuffer.InputLength > sizeof(gpio_info))
+               return -EINVAL;
 
-               uiBit  = gpio_info.uiGpioNumber;
-               uiOperation = gpio_info.uiGpioValue;
-               value = (1<<uiBit);
+       if (copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               if (IsReqGpioIsLedInNVM(Adapter, value) == false) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL,
-                                       "Sorry, Requested GPIO<0x%X> is not correspond to LED !!!",
-                                       value);
-                       Status = -EINVAL;
-                       break;
-               }
+       uiBit  = gpio_info.uiGpioNumber;
+       uiOperation = gpio_info.uiGpioValue;
+       value = (1<<uiBit);
 
-               /* Set - setting 1 */
-               if (uiOperation) {
-                       /* Set the gpio output register */
-                       Status = wrmaltWithLock(Adapter,
-                                               BCM_GPIO_OUTPUT_SET_REG,
-                                               (PUINT)(&value), sizeof(UINT));
-
-                       if (Status == STATUS_SUCCESS) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-                                               OSAL_DBG, DBG_LVL_ALL,
-                                               "Set the GPIO bit\n");
-                       } else {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-                                               OSAL_DBG, DBG_LVL_ALL,
-                                               "Failed to set the %dth GPIO\n",
-                                               uiBit);
-                               break;
-                       }
-               } else {
-                       /* Set the gpio output register */
-                       Status = wrmaltWithLock(Adapter,
-                                               BCM_GPIO_OUTPUT_CLR_REG,
-                                               (PUINT)(&value), sizeof(UINT));
-
-                       if (Status == STATUS_SUCCESS) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-                                               OSAL_DBG, DBG_LVL_ALL,
-                                               "Set the GPIO bit\n");
-                       } else {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-                                               OSAL_DBG, DBG_LVL_ALL,
-                                               "Failed to clear the %dth GPIO\n",
-                                               uiBit);
-                               break;
-                       }
-               }
+       if (IsReqGpioIsLedInNVM(Adapter, value) == false) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL,
+                               "Sorry, Requested GPIO<0x%X> is not correspond to LED !!!",
+                               value);
+               return -EINVAL;
+       }
 
-               bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER,
-                                      (PUINT)ucResetValue, sizeof(UINT));
-               if (bytes < 0) {
-                       Status = bytes;
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                                       "GPIO_MODE_REGISTER read failed");
-                       break;
+       /* Set - setting 1 */
+       if (uiOperation) {
+               /* Set the gpio output register */
+               Status = wrmaltWithLock(Adapter,
+                                       BCM_GPIO_OUTPUT_SET_REG,
+                                       (PUINT)(&value), sizeof(UINT));
+
+               if (Status == STATUS_SUCCESS) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                       OSAL_DBG, DBG_LVL_ALL,
+                                       "Set the GPIO bit\n");
                } else {
-                       Status = STATUS_SUCCESS;
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                       OSAL_DBG, DBG_LVL_ALL,
+                                       "Failed to set the %dth GPIO\n",
+                                       uiBit);
+                       return Status;
                }
-
-               /* Set the gpio mode register to output */
-               *(UINT *)ucResetValue |= (1<<uiBit);
-               Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER,
-                                       (PUINT)ucResetValue, sizeof(UINT));
+       } else {
+               /* Set the gpio output register */
+               Status = wrmaltWithLock(Adapter,
+                                       BCM_GPIO_OUTPUT_CLR_REG,
+                                       (PUINT)(&value), sizeof(UINT));
 
                if (Status == STATUS_SUCCESS) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL,
-                                       "Set the GPIO to output Mode\n");
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                       OSAL_DBG, DBG_LVL_ALL,
+                                       "Set the GPIO bit\n");
                } else {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL,
-                                       "Failed to put GPIO in Output Mode\n");
-                       break;
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                       OSAL_DBG, DBG_LVL_ALL,
+                                       "Failed to clear the %dth GPIO\n",
+                                       uiBit);
+                       return Status;
                }
        }
-       break;
 
-       case BCM_LED_THREAD_STATE_CHANGE_REQ: {
-               struct bcm_user_thread_req threadReq = {0};
+       bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER,
+                              (PUINT)ucResetValue, sizeof(UINT));
+       if (bytes < 0) {
+               Status = bytes;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                               "User made LED thread InActive");
+                               "GPIO_MODE_REGISTER read failed");
+               return Status;
+       } else {
+               Status = STATUS_SUCCESS;
+       }
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       /* Set the gpio mode register to output */
+       *(UINT *)ucResetValue |= (1<<uiBit);
+       Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER,
+                               (PUINT)ucResetValue, sizeof(UINT));
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL,
-                                       "GPIO Can't be set/clear in Low power Mode");
-                       Status = -EACCES;
-                       break;
-               }
+       if (Status == STATUS_SUCCESS) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL,
+                               "Set the GPIO to output Mode\n");
+       } else {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL,
+                               "Failed to put GPIO in Output Mode\n");
+       }
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       return Status;
+}
 
-               if (IoBuffer.InputLength > sizeof(threadReq))
-                       return -EINVAL;
+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_ioctl_buffer IoBuffer;
 
-               if (copy_from_user(&threadReq, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                       "User made LED thread InActive");
 
-               /* if LED thread is running(Actively or Inactively) set it state to make inactive */
-               if (Adapter->LEDInfo.led_thread_running) {
-                       if (threadReq.ThreadState == LED_THREAD_ACTIVATION_REQ) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-                                               OSAL_DBG, DBG_LVL_ALL,
-                                               "Activating thread req");
-                               Adapter->DriverState = LED_THREAD_ACTIVE;
-                       } else {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
-                                               OSAL_DBG, DBG_LVL_ALL,
-                                               "DeActivating Thread req.....");
-                               Adapter->DriverState = LED_THREAD_INACTIVE;
-                       }
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-                       /* signal thread. */
-                       wake_up(&Adapter->LEDInfo.notify_led_event);
-               }
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL,
+                               "GPIO Can't be set/clear in Low power Mode");
+               return -EACCES;
        }
-       break;
-
-       case IOCTL_BCM_GPIO_STATUS_REQUEST: {
-               ULONG uiBit = 0;
-               UCHAR ucRead[4];
-               struct bcm_gpio_info gpio_info = {0};
-
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE))
-                       return -EACCES;
-
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
-
-               if (IoBuffer.InputLength > sizeof(gpio_info))
-                       return -EINVAL;
 
-               if (copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               uiBit = gpio_info.uiGpioNumber;
+       if (IoBuffer.InputLength > sizeof(threadReq))
+               return -EINVAL;
 
-               /* Set the gpio output register */
-               bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
-                                       (PUINT)ucRead, sizeof(UINT));
+       if (copy_from_user(&threadReq, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               if (bytes < 0) {
-                       Status = bytes;
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "RDM Failed\n");
-                       return Status;
+       /* if LED thread is running(Actively or Inactively) set it state to make inactive */
+       if (Adapter->LEDInfo.led_thread_running) {
+               if (threadReq.ThreadState == LED_THREAD_ACTIVATION_REQ) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                       OSAL_DBG, DBG_LVL_ALL,
+                                       "Activating thread req");
+                       Adapter->DriverState = LED_THREAD_ACTIVE;
                } else {
-                       Status = STATUS_SUCCESS;
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                       OSAL_DBG, DBG_LVL_ALL,
+                                       "DeActivating Thread req.....");
+                       Adapter->DriverState = LED_THREAD_INACTIVE;
                }
-       }
-       break;
 
-       case IOCTL_BCM_GPIO_MULTI_REQUEST: {
-               UCHAR ucResetValue[4];
-               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;
+               /* signal thread. */
+               wake_up(&Adapter->LEDInfo.notify_led_event);
+       }
+       return STATUS_SUCCESS;
+}
 
-               memset(pgpio_multi_info, 0, MAX_IDX * sizeof(struct bcm_gpio_multi_info));
-
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE))
-                       return -EINVAL;
+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_ioctl_buffer IoBuffer;
+       ULONG uiBit = 0;
+       UCHAR ucRead[4];
+       INT Status;
+       int bytes;
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE))
+               return -EACCES;
 
-               if (IoBuffer.InputLength > sizeof(gpio_multi_info))
-                       return -EINVAL;
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               if (copy_from_user(&gpio_multi_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+       if (IoBuffer.InputLength > sizeof(gpio_info))
+               return -EINVAL;
 
-               if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL,
-                                       "Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
-                                       pgpio_multi_info[WIMAX_IDX].uiGPIOMask,
-                                       Adapter->gpioBitMap);
-                       Status = -EINVAL;
-                       break;
-               }
+       if (copy_from_user(&gpio_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               /* Set the gpio output register */
-               if ((pgpio_multi_info[WIMAX_IDX].uiGPIOMask) &
-                       (pgpio_multi_info[WIMAX_IDX].uiGPIOCommand)) {
-                       /* Set 1's in GPIO OUTPUT REGISTER */
-                       *(UINT *)ucResetValue =  pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
-                               pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
-                               pgpio_multi_info[WIMAX_IDX].uiGPIOValue;
+       uiBit = gpio_info.uiGpioNumber;
 
-                       if (*(UINT *) ucResetValue)
-                               Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG,
-                                                       (PUINT)ucResetValue, sizeof(ULONG));
+       /* Set the gpio output register */
+       bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
+                               (PUINT)ucRead, sizeof(UINT));
 
-                       if (Status != STATUS_SUCCESS) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                               "WRM to BCM_GPIO_OUTPUT_SET_REG Failed.");
-                               return Status;
-                       }
+       if (bytes < 0) {
+               Status = bytes;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "RDM Failed\n");
+               return Status;
+       } else {
+               Status = STATUS_SUCCESS;
+       }
+       return Status;
+}
 
-                       /* Clear to 0's in GPIO OUTPUT REGISTER */
-                       *(UINT *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
-                                               pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
-                                               (~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
+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 *pgpio_multi_info = (struct bcm_gpio_multi_info *)gpio_multi_info;
+       struct bcm_ioctl_buffer IoBuffer;
+       UCHAR ucResetValue[4];
+       INT Status = STATUS_FAILURE;
+       int bytes;
 
-                       if (*(UINT *) ucResetValue)
-                               Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue, sizeof(ULONG));
+       memset(pgpio_multi_info, 0, MAX_IDX * sizeof(struct bcm_gpio_multi_info));
 
-                       if (Status != STATUS_SUCCESS) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                               "WRM to BCM_GPIO_OUTPUT_CLR_REG Failed.");
-                               return Status;
-                       }
-               }
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE))
+               return -EINVAL;
 
-               if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {
-                       bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-                       if (bytes < 0) {
-                               Status = bytes;
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                               "RDM to GPIO_PIN_STATE_REGISTER Failed.");
-                               return Status;
-                       } else {
-                               Status = STATUS_SUCCESS;
-                       }
+       if (IoBuffer.InputLength > sizeof(gpio_multi_info))
+               return -EINVAL;
+       if (IoBuffer.OutputLength > sizeof(gpio_multi_info))
+               IoBuffer.OutputLength = sizeof(gpio_multi_info);
 
-                       pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
-                                                               pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
-               }
+       if (copy_from_user(&gpio_multi_info, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_info, IoBuffer.OutputLength);
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Failed while copying Content to IOBufer for user space err:%d", Status);
-                       return -EFAULT;
-               }
+       if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_info[WIMAX_IDX].uiGPIOMask) == false) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL,
+                               "Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
+                               pgpio_multi_info[WIMAX_IDX].uiGPIOMask,
+                               Adapter->gpioBitMap);
+               return -EINVAL;
        }
-       break;
 
-       case IOCTL_BCM_GPIO_MODE_REQUEST: {
-               UCHAR ucResetValue[4];
-               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;
+       /* Set the gpio output register */
+       if ((pgpio_multi_info[WIMAX_IDX].uiGPIOMask) &
+               (pgpio_multi_info[WIMAX_IDX].uiGPIOCommand)) {
+               /* Set 1's in GPIO OUTPUT REGISTER */
+               *(UINT *)ucResetValue =  pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
+                       pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
+                       pgpio_multi_info[WIMAX_IDX].uiGPIOValue;
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE))
-                       return -EINVAL;
+               if (*(UINT *) ucResetValue)
+                       Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_SET_REG,
+                                               (PUINT)ucResetValue, sizeof(ULONG));
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+               if (Status != STATUS_SUCCESS) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                                       "WRM to BCM_GPIO_OUTPUT_SET_REG Failed.");
+                       return Status;
+               }
 
-               if (IoBuffer.InputLength > sizeof(gpio_multi_mode))
-                       return -EINVAL;
+               /* Clear to 0's in GPIO OUTPUT REGISTER */
+               *(UINT *)ucResetValue = (pgpio_multi_info[WIMAX_IDX].uiGPIOMask &
+                                       pgpio_multi_info[WIMAX_IDX].uiGPIOCommand &
+                                       (~(pgpio_multi_info[WIMAX_IDX].uiGPIOValue)));
 
-               if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                       return -EFAULT;
+               if (*(UINT *) ucResetValue)
+                       Status = wrmaltWithLock(Adapter, BCM_GPIO_OUTPUT_CLR_REG, (PUINT)ucResetValue, sizeof(ULONG));
+
+               if (Status != STATUS_SUCCESS) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                                       "WRM to BCM_GPIO_OUTPUT_CLR_REG Failed.");
+                       return Status;
+               }
+       }
 
-               bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+       if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {
+               bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
 
                if (bytes < 0) {
                        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,
+                                       "RDM to GPIO_PIN_STATE_REGISTER Failed.");
                        return Status;
                } else {
                        Status = STATUS_SUCCESS;
                }
 
-               /* Validating the request */
-               if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == false) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                                       "Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
-                                       pgpio_multi_mode[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
-                       Status = -EINVAL;
-                       break;
-               }
-
-               if (pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) {
-                       /* write all OUT's (1's) */
-                       *(UINT *) ucResetValue |= (pgpio_multi_mode[WIMAX_IDX].uiGPIOMode &
-                                               pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
-
-                       /* write all IN's (0's) */
-                       *(UINT *) ucResetValue &= ~((~pgpio_multi_mode[WIMAX_IDX].uiGPIOMode) &
-                                               pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
-
-                       /* Currently implemented return the modes of all GPIO's
-                        * else needs to bit AND with  mask
-                        */
-                       pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
-
-                       Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(ULONG));
-                       if (Status == STATUS_SUCCESS) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                                               "WRM to GPIO_MODE_REGISTER Done");
-                       } else {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                               "WRM to GPIO_MODE_REGISTER Failed");
-                               Status = -EFAULT;
-                               break;
-                       }
-               } else {
-/* if uiGPIOMask is 0 then return mode register configuration */
-                       pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
-               }
-
-               Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_mode, IoBuffer.OutputLength);
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Failed while copying Content to IOBufer for user space err:%d", Status);
-                       return -EFAULT;
-               }
+               pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
+                                                       pgpio_multi_info[WIMAX_IDX].uiGPIOMask);
        }
-       break;
 
-       case IOCTL_MAC_ADDR_REQ:
-       case IOCTL_LINK_REQ:
-       case IOCTL_CM_REQUEST:
-       case IOCTL_SS_INFO_REQ:
-       case IOCTL_SEND_CONTROL_MESSAGE:
-       case IOCTL_IDLE_REQ: {
-               PVOID pvBuffer = NULL;
+       Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_info, IoBuffer.OutputLength);
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Failed while copying Content to IOBufer for user space err:%d", Status);
+               return -EFAULT;
+       }
+       return Status;
+}
 
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+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 *pgpio_multi_mode = (struct bcm_gpio_multi_mode *)gpio_multi_mode;
+       struct bcm_ioctl_buffer IoBuffer;
+       UCHAR ucResetValue[4];
+       INT Status;
+       int bytes;
 
-               if (IoBuffer.InputLength < sizeof(struct bcm_link_request))
-                       return -EINVAL;
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE))
+               return -EINVAL;
 
-               if (IoBuffer.InputLength > MAX_CNTL_PKT_SIZE)
-                       return -EINVAL;
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               pvBuffer = memdup_user(IoBuffer.InputBuffer,
-                                      IoBuffer.InputLength);
-               if (IS_ERR(pvBuffer))
-                       return PTR_ERR(pvBuffer);
+       if (IoBuffer.InputLength > sizeof(gpio_multi_mode))
+               return -EINVAL;
+       if (IoBuffer.OutputLength > sizeof(gpio_multi_mode))
+               IoBuffer.OutputLength = sizeof(gpio_multi_mode);
 
-               down(&Adapter->LowPowerModeSync);
-               Status = wait_event_interruptible_timeout(Adapter->lowpower_mode_wait_queue,
-                                                       !Adapter->bPreparingForLowPowerMode,
-                                                       (1 * HZ));
-               if (Status == -ERESTARTSYS)
-                       goto cntrlEnd;
+       if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))
+               return -EFAULT;
 
-               if (Adapter->bPreparingForLowPowerMode) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                                       "Preparing Idle Mode is still True - Hence Rejecting control message\n");
-                       Status = STATUS_FAILURE;
-                       goto cntrlEnd;
-               }
-               Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer);
+       bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
 
-cntrlEnd:
-               up(&Adapter->LowPowerModeSync);
-               kfree(pvBuffer);
-               break;
+       if (bytes < 0) {
+               Status = bytes;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Read of GPIO_MODE_REGISTER failed");
+               return Status;
+       } else {
+               Status = STATUS_SUCCESS;
        }
 
-       case IOCTL_BCM_BUFFER_DOWNLOAD_START: {
-               if (down_trylock(&Adapter->NVMRdmWrmLock)) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
-                                       "IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
-                       return -EACCES;
-               }
+       /* Validating the request */
+       if (IsReqGpioIsLedInNVM(Adapter, pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) == false) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                               "Sorry, Requested GPIO<0x%X> is not correspond to NVM LED bit map<0x%X>!!!",
+                               pgpio_multi_mode[WIMAX_IDX].uiGPIOMask, Adapter->gpioBitMap);
+               return -EINVAL;
+       }
 
-               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))
-                       return -EBUSY;
-
-               Adapter->bBinDownloaded = false;
-               Adapter->fw_download_process_pid = current->pid;
-               Adapter->bCfgDownloaded = false;
-               Adapter->fw_download_done = false;
-               netif_carrier_off(Adapter->dev);
-               netif_stop_queue(Adapter->dev);
-               Status = reset_card_proc(Adapter);
-               if (Status) {
-                       pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter->dev->name);
-                       up(&Adapter->fw_download_sema);
-                       up(&Adapter->NVMRdmWrmLock);
-                       return Status;
-               }
-               mdelay(10);
+       if (pgpio_multi_mode[WIMAX_IDX].uiGPIOMask) {
+               /* write all OUT's (1's) */
+               *(UINT *) ucResetValue |= (pgpio_multi_mode[WIMAX_IDX].uiGPIOMode &
+                                       pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
 
-               up(&Adapter->NVMRdmWrmLock);
-               return Status;
-       }
+               /* write all IN's (0's) */
+               *(UINT *) ucResetValue &= ~((~pgpio_multi_mode[WIMAX_IDX].uiGPIOMode) &
+                                       pgpio_multi_mode[WIMAX_IDX].uiGPIOMask);
 
-       case IOCTL_BCM_BUFFER_DOWNLOAD: {
-               struct bcm_firmware_info *psFwInfo = NULL;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
+               /* Currently implemented return the modes of all GPIO's
+                * else needs to bit AND with  mask
+                */
+               pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
 
-               if (!down_trylock(&Adapter->fw_download_sema)) {
+               Status = wrmaltWithLock(Adapter, GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(ULONG));
+               if (Status == STATUS_SUCCESS) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                                       "WRM to GPIO_MODE_REGISTER Done");
+               } else {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Invalid way to download buffer. Use Start and then call this!!!\n");
-                       up(&Adapter->fw_download_sema);
-                       Status = -EINVAL;
-                       return Status;
-               }
-
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
-                       up(&Adapter->fw_download_sema);
+                                       "WRM to GPIO_MODE_REGISTER Failed");
                        return -EFAULT;
                }
+       } else {
+               /* if uiGPIOMask is 0 then return mode register configuration */
+               pgpio_multi_mode[WIMAX_IDX].uiGPIOMode = *(UINT *)ucResetValue;
+       }
 
+       Status = copy_to_user(IoBuffer.OutputBuffer, &gpio_multi_mode, IoBuffer.OutputLength);
+       if (Status) {
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                               "Length for FW DLD is : %lx\n", IoBuffer.InputLength);
+                               "Failed while copying Content to IOBufer for user space err:%d", Status);
+               return -EFAULT;
+       }
+       return Status;
+}
 
-               if (IoBuffer.InputLength > sizeof(struct bcm_firmware_info)) {
-                       up(&Adapter->fw_download_sema);
-                       return -EINVAL;
-               }
+static int bcm_char_ioctl_misc_request(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       PVOID pvBuffer = NULL;
+       INT Status;
 
-               psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
-               if (!psFwInfo) {
-                       up(&Adapter->fw_download_sema);
-                       return -ENOMEM;
-               }
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength)) {
-                       up(&Adapter->fw_download_sema);
-                       kfree(psFwInfo);
-                       return -EFAULT;
-               }
+       if (IoBuffer.InputLength < sizeof(struct bcm_link_request))
+               return -EINVAL;
 
-               if (!psFwInfo->pvMappedFirmwareAddress ||
-                       (psFwInfo->u32FirmwareLength == 0)) {
+       if (IoBuffer.InputLength > MAX_CNTL_PKT_SIZE)
+               return -EINVAL;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
-                                       psFwInfo->u32FirmwareLength);
-                       up(&Adapter->fw_download_sema);
-                       kfree(psFwInfo);
-                       Status = -EINVAL;
-                       return Status;
-               }
+       pvBuffer = memdup_user(IoBuffer.InputBuffer,
+                              IoBuffer.InputLength);
+       if (IS_ERR(pvBuffer))
+               return PTR_ERR(pvBuffer);
 
-               Status = bcm_ioctl_fw_download(Adapter, psFwInfo);
+       down(&Adapter->LowPowerModeSync);
+       Status = wait_event_interruptible_timeout(Adapter->lowpower_mode_wait_queue,
+                                               !Adapter->bPreparingForLowPowerMode,
+                                               (1 * HZ));
+       if (Status == -ERESTARTSYS)
+               goto cntrlEnd;
 
-               if (Status != STATUS_SUCCESS) {
-                       if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
-                       else
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
+       if (Adapter->bPreparingForLowPowerMode) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                               "Preparing Idle Mode is still True - Hence Rejecting control message\n");
+               Status = STATUS_FAILURE;
+               goto cntrlEnd;
+       }
+       Status = CopyBufferToControlPacket(Adapter, (PVOID)pvBuffer);
 
-                       /* up(&Adapter->fw_download_sema); */
+cntrlEnd:
+       up(&Adapter->LowPowerModeSync);
+       kfree(pvBuffer);
+       return Status;
+}
 
-                       if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                               Adapter->DriverState = DRIVER_INIT;
-                               Adapter->LEDInfo.bLedInitDone = false;
-                               wake_up(&Adapter->LEDInfo.notify_led_event);
-                       }
-               }
+static int bcm_char_ioctl_buffer_download_start(struct bcm_mini_adapter *Adapter)
+{
+       INT Status;
 
-               if (Status != STATUS_SUCCESS)
-                       up(&Adapter->fw_download_sema);
+       if (down_trylock(&Adapter->NVMRdmWrmLock)) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                               "IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
+               return -EACCES;
+       }
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");
-               kfree(psFwInfo);
+       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))
+               return -EBUSY;
+
+       Adapter->bBinDownloaded = false;
+       Adapter->fw_download_process_pid = current->pid;
+       Adapter->bCfgDownloaded = false;
+       Adapter->fw_download_done = false;
+       netif_carrier_off(Adapter->dev);
+       netif_stop_queue(Adapter->dev);
+       Status = reset_card_proc(Adapter);
+       if (Status) {
+               pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter->dev->name);
+               up(&Adapter->fw_download_sema);
+               up(&Adapter->NVMRdmWrmLock);
                return Status;
        }
+       mdelay(10);
 
-       case IOCTL_BCM_BUFFER_DOWNLOAD_STOP: {
-               if (!down_trylock(&Adapter->fw_download_sema)) {
-                       up(&Adapter->fw_download_sema);
-                       return -EINVAL;
-               }
+       up(&Adapter->NVMRdmWrmLock);
+       return Status;
+}
 
-               if (down_trylock(&Adapter->NVMRdmWrmLock)) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "FW download blocked as EEPROM Read/Write is in progress\n");
-                       up(&Adapter->fw_download_sema);
-                       return -EACCES;
-               }
+static int bcm_char_ioctl_buffer_download(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_firmware_info *psFwInfo = NULL;
+       struct bcm_ioctl_buffer IoBuffer;
+       INT Status;
 
-               Adapter->bBinDownloaded = TRUE;
-               Adapter->bCfgDownloaded = TRUE;
-               atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
-               Adapter->CurrNumRecvDescs = 0;
-               Adapter->downloadDDR = 0;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
 
-               /* setting the Mips to Run */
-               Status = run_card_proc(Adapter);
+       if (!down_trylock(&Adapter->fw_download_sema)) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Invalid way to download buffer. Use Start and then call this!!!\n");
+               up(&Adapter->fw_download_sema);
+               return -EINVAL;
+       }
 
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");
-                       up(&Adapter->fw_download_sema);
-                       up(&Adapter->NVMRdmWrmLock);
-                       return Status;
-               } else {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                       DBG_LVL_ALL, "Firm Download Over...\n");
-               }
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
+               up(&Adapter->fw_download_sema);
+               return -EFAULT;
+       }
 
-               mdelay(10);
-
-               /* Wait for MailBox Interrupt */
-               if (StartInterruptUrb((struct bcm_interface_adapter *)Adapter->pvInterfaceAdapter))
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");
-
-               timeout = 5*HZ;
-               Adapter->waiting_to_fw_download_done = false;
-               wait_event_timeout(Adapter->ioctl_fw_dnld_wait_queue,
-                               Adapter->waiting_to_fw_download_done, timeout);
-               Adapter->fw_download_process_pid = INVALID_PID;
-               Adapter->fw_download_done = TRUE;
-               atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
-               Adapter->CurrNumRecvDescs = 0;
-               Adapter->PrevNumRecvDescs = 0;
-               atomic_set(&Adapter->cntrlpktCnt, 0);
-               Adapter->LinkUpStatus = 0;
-               Adapter->LinkStatus = 0;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                       "Length for FW DLD is : %lx\n", IoBuffer.InputLength);
 
-               if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                       Adapter->DriverState = FW_DOWNLOAD_DONE;
-                       wake_up(&Adapter->LEDInfo.notify_led_event);
-               }
+       if (IoBuffer.InputLength > sizeof(struct bcm_firmware_info)) {
+               up(&Adapter->fw_download_sema);
+               return -EINVAL;
+       }
 
-               if (!timeout)
-                       Status = -ENODEV;
+       psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
+       if (!psFwInfo) {
+               up(&Adapter->fw_download_sema);
+               return -ENOMEM;
+       }
 
+       if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength)) {
                up(&Adapter->fw_download_sema);
-               up(&Adapter->NVMRdmWrmLock);
-               return Status;
+               kfree(psFwInfo);
+               return -EFAULT;
        }
 
-       case IOCTL_BE_BUCKET_SIZE:
-               Status = 0;
-               if (get_user(Adapter->BEBucketSize, (unsigned long __user *)arg))
-                       Status = -EFAULT;
-               break;
+       if (!psFwInfo->pvMappedFirmwareAddress ||
+               (psFwInfo->u32FirmwareLength == 0)) {
 
-       case IOCTL_RTPS_BUCKET_SIZE:
-               Status = 0;
-               if (get_user(Adapter->rtPSBucketSize, (unsigned long __user *)arg))
-                       Status = -EFAULT;
-               break;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
+                               psFwInfo->u32FirmwareLength);
+               up(&Adapter->fw_download_sema);
+               kfree(psFwInfo);
+               Status = -EINVAL;
+               return Status;
+       }
 
-       case IOCTL_CHIP_RESET: {
-               INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
-               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");
-                       return -EACCES;
-               }
+       Status = bcm_ioctl_fw_download(Adapter, psFwInfo);
 
-               down(&Adapter->RxAppControlQueuelock);
-               Status = reset_card_proc(Adapter);
-               flushAllAppQ();
-               up(&Adapter->RxAppControlQueuelock);
-               up(&Adapter->NVMRdmWrmLock);
-               ResetCounters(Adapter);
-               break;
-       }
+       if (Status != STATUS_SUCCESS) {
+               if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
+               else
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
 
-       case IOCTL_QOS_THRESHOLD: {
-               USHORT uiLoopIndex;
+               /* up(&Adapter->fw_download_sema); */
 
-               Status = 0;
-               for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
-                       if (get_user(Adapter->PackInfo[uiLoopIndex].uiThreshold,
-                                       (unsigned long __user *)arg)) {
-                               Status = -EFAULT;
-                               break;
-                       }
+               if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
+                       Adapter->DriverState = DRIVER_INIT;
+                       Adapter->LEDInfo.bLedInitDone = false;
+                       wake_up(&Adapter->LEDInfo.notify_led_event);
                }
-               break;
        }
 
-       case IOCTL_DUMP_PACKET_INFO:
-               DumpPackInfo(Adapter);
-               DumpPhsRules(&Adapter->stBCMPhsContext);
-               Status = STATUS_SUCCESS;
-               break;
+       if (Status != STATUS_SUCCESS)
+               up(&Adapter->fw_download_sema);
 
-       case IOCTL_GET_PACK_INFO:
-               if (copy_to_user(argp, &Adapter->PackInfo, sizeof(struct bcm_packet_info)*NO_OF_QUEUES))
-                       return -EFAULT;
-               Status = STATUS_SUCCESS;
-               break;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");
+       kfree(psFwInfo);
+       return Status;
+}
 
-       case IOCTL_BCM_SWITCH_TRANSFER_MODE: {
-               UINT uiData = 0;
-               if (copy_from_user(&uiData, argp, sizeof(UINT)))
-                       return -EFAULT;
+static int bcm_char_ioctl_buffer_download_stop(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       INT Status;
+       int timeout = 0;
 
-               if (uiData) {
-                       /* 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");
-                               Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
-               } else {
-                       /* 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");
-                       Adapter->TransferMode = IP_PACKET_ONLY_MODE;
-               }
-               Status = STATUS_SUCCESS;
-               break;
+       if (!down_trylock(&Adapter->fw_download_sema)) {
+               up(&Adapter->fw_download_sema);
+               return -EINVAL;
        }
 
-       case IOCTL_BCM_GET_DRIVER_VERSION: {
-               ulong len;
+       if (down_trylock(&Adapter->NVMRdmWrmLock)) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "FW download blocked as EEPROM Read/Write is in progress\n");
+               up(&Adapter->fw_download_sema);
+               return -EACCES;
+       }
 
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       Adapter->bBinDownloaded = TRUE;
+       Adapter->bCfgDownloaded = TRUE;
+       atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
+       Adapter->CurrNumRecvDescs = 0;
+       Adapter->downloadDDR = 0;
 
-               len = min_t(ulong, IoBuffer.OutputLength, strlen(DRV_VERSION) + 1);
+       /* setting the Mips to Run */
+       Status = run_card_proc(Adapter);
 
-               if (copy_to_user(IoBuffer.OutputBuffer, DRV_VERSION, len))
-                       return -EFAULT;
-               Status = STATUS_SUCCESS;
-               break;
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");
+               up(&Adapter->fw_download_sema);
+               up(&Adapter->NVMRdmWrmLock);
+               return Status;
+       } else {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                               DBG_LVL_ALL, "Firm Download Over...\n");
        }
 
-       case IOCTL_BCM_GET_CURRENT_STATUS: {
-               struct bcm_link_state link_state;
+       mdelay(10);
+
+       /* Wait for MailBox Interrupt */
+       if (StartInterruptUrb((struct bcm_interface_adapter *)Adapter->pvInterfaceAdapter))
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");
+
+       timeout = 5*HZ;
+       Adapter->waiting_to_fw_download_done = false;
+       wait_event_timeout(Adapter->ioctl_fw_dnld_wait_queue,
+                       Adapter->waiting_to_fw_download_done, timeout);
+       Adapter->fw_download_process_pid = INVALID_PID;
+       Adapter->fw_download_done = TRUE;
+       atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
+       Adapter->CurrNumRecvDescs = 0;
+       Adapter->PrevNumRecvDescs = 0;
+       atomic_set(&Adapter->cntrlpktCnt, 0);
+       Adapter->LinkUpStatus = 0;
+       Adapter->LinkStatus = 0;
+
+       if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
+               Adapter->DriverState = FW_DOWNLOAD_DONE;
+               wake_up(&Adapter->LEDInfo.notify_led_event);
+       }
 
-               /* Copy Ioctl Buffer structure */
-               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");
-                       return -EFAULT;
-               }
+       if (!timeout)
+               Status = -ENODEV;
 
-               if (IoBuffer.OutputLength != sizeof(link_state)) {
-                       Status = -EINVAL;
-                       break;
-               }
+       up(&Adapter->fw_download_sema);
+       up(&Adapter->NVMRdmWrmLock);
+       return Status;
+}
 
-               memset(&link_state, 0, sizeof(link_state));
-               link_state.bIdleMode = Adapter->IdleMode;
-               link_state.bShutdownMode = Adapter->bShutStatus;
-               link_state.ucLinkStatus = Adapter->LinkStatus;
+static int bcm_char_ioctl_chip_reset(struct bcm_mini_adapter *Adapter)
+{
+       INT Status;
+       INT NVMAccess;
 
-               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;
-               }
-               Status = STATUS_SUCCESS;
-               break;
+       NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
+       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");
+               return -EACCES;
        }
 
-       case IOCTL_BCM_SET_MAC_TRACING: {
-               UINT  tracing_flag;
+       down(&Adapter->RxAppControlQueuelock);
+       Status = reset_card_proc(Adapter);
+       flushAllAppQ();
+       up(&Adapter->RxAppControlQueuelock);
+       up(&Adapter->NVMRdmWrmLock);
+       ResetCounters(Adapter);
+       return Status;
+}
 
-               /* copy ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+static int bcm_char_ioctl_qos_threshold(ULONG arg, struct bcm_mini_adapter *Adapter)
+{
+       USHORT uiLoopIndex;
 
-               if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(UINT)))
+       for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES; uiLoopIndex++) {
+               if (get_user(Adapter->PackInfo[uiLoopIndex].uiThreshold,
+                               (unsigned long __user *)arg)) {
                        return -EFAULT;
-
-               if (tracing_flag)
-                       Adapter->pTarangs->MacTracingEnabled = TRUE;
-               else
-                       Adapter->pTarangs->MacTracingEnabled = false;
-               break;
+               }
        }
+       return 0;
+}
 
-       case IOCTL_BCM_GET_DSX_INDICATION: {
-               ULONG ulSFId = 0;
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
-
-               if (IoBuffer.OutputLength < sizeof(struct bcm_add_indication_alt)) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Mismatch req: %lx needed is =0x%zx!!!",
-                                       IoBuffer.OutputLength, sizeof(struct bcm_add_indication_alt));
-                       return -EINVAL;
-               }
+static int bcm_char_ioctl_switch_transfer_mode(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       UINT uiData = 0;
 
-               if (copy_from_user(&ulSFId, IoBuffer.InputBuffer, sizeof(ulSFId)))
-                       return -EFAULT;
+       if (copy_from_user(&uiData, argp, sizeof(UINT)))
+               return -EFAULT;
 
-               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);
-               Status = STATUS_SUCCESS;
+       if (uiData) {
+               /* 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");
+                       Adapter->TransferMode = ETH_PACKET_TUNNELING_MODE;
+       } else {
+               /* 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");
+               Adapter->TransferMode = IP_PACKET_ONLY_MODE;
        }
-       break;
+       return STATUS_SUCCESS;
+}
 
-       case IOCTL_BCM_GET_HOST_MIBS: {
-               PVOID temp_buff;
+static int bcm_char_ioctl_get_driver_version(void __user *argp)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       ulong len;
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               if (IoBuffer.OutputLength != sizeof(struct bcm_host_stats_mibs)) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                       "Length Check failed %lu %zd\n",
-                                       IoBuffer.OutputLength, sizeof(struct bcm_host_stats_mibs));
-                       return -EINVAL;
-               }
+       len = min_t(ulong, IoBuffer.OutputLength, strlen(DRV_VERSION) + 1);
 
-               /* FIXME: HOST_STATS are too big for kmalloc (122048)! */
-               temp_buff = kzalloc(sizeof(struct bcm_host_stats_mibs), GFP_KERNEL);
-               if (!temp_buff)
-                       return STATUS_FAILURE;
+       if (copy_to_user(IoBuffer.OutputBuffer, DRV_VERSION, len))
+               return -EFAULT;
 
-               Status = ProcessGetHostMibs(Adapter, temp_buff);
-               GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
+       return STATUS_SUCCESS;
+}
 
-               if (Status != STATUS_FAILURE)
-                       if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(struct bcm_host_stats_mibs))) {
-                               kfree(temp_buff);
-                               return -EFAULT;
-                       }
+static int bcm_char_ioctl_get_current_status(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_link_state link_state;
+       struct bcm_ioctl_buffer IoBuffer;
 
-               kfree(temp_buff);
-               break;
+       /* Copy Ioctl Buffer structure */
+       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");
+               return -EFAULT;
        }
 
-       case IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE:
-               if ((false == Adapter->bTriedToWakeUpFromlowPowerMode) && (TRUE == Adapter->IdleMode)) {
-                       Adapter->usIdleModePattern = ABORT_IDLE_MODE;
-                       Adapter->bWakeUpDevice = TRUE;
-                       wake_up(&Adapter->process_rx_cntrlpkt);
-               }
+       if (IoBuffer.OutputLength != sizeof(link_state))
+               return -EINVAL;
 
-               Status = STATUS_SUCCESS;
-               break;
+       memset(&link_state, 0, sizeof(link_state));
+       link_state.bIdleMode = Adapter->IdleMode;
+       link_state.bShutdownMode = Adapter->bShutStatus;
+       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");
+               return -EFAULT;
+       }
+       return STATUS_SUCCESS;
+}
 
-       case IOCTL_BCM_BULK_WRM: {
-               struct bcm_bulk_wrm_buffer *pBulkBuffer;
-               UINT uiTempVar = 0;
-               PCHAR pvBuffer = NULL;
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+static int bcm_char_ioctl_set_mac_tracing(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       UINT tracing_flag;
 
-                       BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "Device in Idle/Shutdown Mode, Blocking Wrms\n");
-                       Status = -EACCES;
-                       break;
-               }
+       /* copy ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       if (copy_from_user(&tracing_flag, IoBuffer.InputBuffer, sizeof(UINT)))
+               return -EFAULT;
 
-               if (IoBuffer.InputLength < sizeof(ULONG) * 2)
-                       return -EINVAL;
+       if (tracing_flag)
+               Adapter->pTarangs->MacTracingEnabled = TRUE;
+       else
+               Adapter->pTarangs->MacTracingEnabled = false;
 
-               pvBuffer = memdup_user(IoBuffer.InputBuffer,
-                                      IoBuffer.InputLength);
-               if (IS_ERR(pvBuffer))
-                       return PTR_ERR(pvBuffer);
+       return STATUS_SUCCESS;
+}
 
-               pBulkBuffer = (struct bcm_bulk_wrm_buffer *)pvBuffer;
+static int bcm_char_ioctl_get_dsx_indication(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       ULONG ulSFId = 0;
 
-               if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
-                       ((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);
-                       kfree(pvBuffer);
-                       Status = -EINVAL;
-                       break;
-               }
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               uiTempVar = pBulkBuffer->Register & EEPROM_REJECT_MASK;
-               if (!((Adapter->pstargetparams->m_u32Customize)&VSG_MODE) &&
-                       ((uiTempVar == EEPROM_REJECT_REG_1) ||
-                               (uiTempVar == EEPROM_REJECT_REG_2) ||
-                               (uiTempVar == EEPROM_REJECT_REG_3) ||
-                               (uiTempVar == EEPROM_REJECT_REG_4)) &&
-                       (cmd == IOCTL_BCM_REGISTER_WRITE)) {
+       if (IoBuffer.OutputLength < sizeof(struct bcm_add_indication_alt)) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Mismatch req: %lx needed is =0x%zx!!!",
+                               IoBuffer.OutputLength, sizeof(struct bcm_add_indication_alt));
+               return -EINVAL;
+       }
 
-                       kfree(pvBuffer);
-                       BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "EEPROM Access Denied, not in VSG Mode\n");
-                       Status = -EFAULT;
-                       break;
-               }
+       if (copy_from_user(&ulSFId, IoBuffer.InputBuffer, sizeof(ulSFId)))
+               return -EFAULT;
 
-               if (pBulkBuffer->SwapEndian == false)
-                       Status = wrmWithLock(Adapter, (UINT)pBulkBuffer->Register, (PCHAR)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
-               else
-                       Status = wrmaltWithLock(Adapter, (UINT)pBulkBuffer->Register, (PUINT)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
+       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);
+       return STATUS_SUCCESS;
+}
 
-               if (Status != STATUS_SUCCESS)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n");
+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;
+       INT Status = STATUS_FAILURE;
+       PVOID temp_buff;
 
-               kfree(pvBuffer);
-               break;
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
+
+       if (IoBuffer.OutputLength != sizeof(struct bcm_host_stats_mibs)) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                               "Length Check failed %lu %zd\n",
+                               IoBuffer.OutputLength, sizeof(struct bcm_host_stats_mibs));
+               return -EINVAL;
        }
 
-       case IOCTL_BCM_GET_NVM_SIZE:
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       /* FIXME: HOST_STATS are too big for kmalloc (122048)! */
+       temp_buff = kzalloc(sizeof(struct bcm_host_stats_mibs), GFP_KERNEL);
+       if (!temp_buff)
+               return STATUS_FAILURE;
 
-               if (Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH) {
-                       if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize, sizeof(UINT)))
-                               return -EFAULT;
+       Status = ProcessGetHostMibs(Adapter, temp_buff);
+       GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
+
+       if (Status != STATUS_FAILURE) {
+               if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(struct bcm_host_stats_mibs))) {
+                       kfree(temp_buff);
+                       return -EFAULT;
                }
+       }
 
-               Status = STATUS_SUCCESS;
-               break;
+       kfree(temp_buff);
+       return Status;
+}
 
-       case IOCTL_BCM_CAL_INIT: {
-               UINT uiSectorSize = 0;
-               if (Adapter->eNVMType == NVM_FLASH) {
-                       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                               return -EFAULT;
+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_ioctl_buffer IoBuffer;
+       UINT uiTempVar = 0;
+       INT Status = STATUS_FAILURE;
+       PCHAR pvBuffer = NULL;
 
-                       if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(UINT)))
-                               return -EFAULT;
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-                       if ((uiSectorSize < MIN_SECTOR_SIZE) || (uiSectorSize > MAX_SECTOR_SIZE)) {
-                               if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize,
-                                                       sizeof(UINT)))
-                                       return -EFAULT;
-                       } else {
-                               if (IsFlash2x(Adapter)) {
-                                       if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize, sizeof(UINT)))
-                                               return -EFAULT;
-                               } else {
-                                       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;
-                                       }
-
-                                       Adapter->uiSectorSize = uiSectorSize;
-                                       BcmUpdateSectorSize(Adapter, Adapter->uiSectorSize);
-                               }
-                       }
-                       Status = STATUS_SUCCESS;
-               } else {
-                       Status = STATUS_FAILURE;
-               }
+               BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "Device in Idle/Shutdown Mode, Blocking Wrms\n");
+               return -EACCES;
        }
-       break;
 
-       case IOCTL_BCM_SET_DEBUG:
-#ifdef DEBUG
-       {
-               struct bcm_user_debug_state sUserDebugState;
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               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)))
-                       return -EFAULT;
+       if (IoBuffer.InputLength < sizeof(ULONG) * 2)
+               return -EINVAL;
 
-               if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(struct bcm_user_debug_state)))
-                       return -EFAULT;
+       pvBuffer = memdup_user(IoBuffer.InputBuffer,
+                              IoBuffer.InputLength);
+       if (IS_ERR(pvBuffer))
+               return PTR_ERR(pvBuffer);
 
-               BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",
-                               sUserDebugState.OnOff, sUserDebugState.Type);
-               /* sUserDebugState.Subtype <<= 1; */
-               sUserDebugState.Subtype = 1 << sUserDebugState.Subtype;
-               BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "actual Subtype=0x%x\n", sUserDebugState.Subtype);
-
-               /* Update new 'DebugState' in the Adapter */
-               Adapter->stDebugState.type |= sUserDebugState.Type;
-               /* Subtype: A bitmap of 32 bits for Subtype per Type.
-                * Valid indexes in 'subtype' array: 1,2,4,8
-                * corresponding to valid Type values. Hence we can use the 'Type' field
-                * as the index value, ignoring the array entries 0,3,5,6,7 !
-                */
-               if (sUserDebugState.OnOff)
-                       Adapter->stDebugState.subtype[sUserDebugState.Type] |= sUserDebugState.Subtype;
-               else
-                       Adapter->stDebugState.subtype[sUserDebugState.Type] &= ~sUserDebugState.Subtype;
+       pBulkBuffer = (struct bcm_bulk_wrm_buffer *)pvBuffer;
 
-               BCM_SHOW_DEBUG_BITMAP(Adapter);
+       if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
+               ((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);
+               kfree(pvBuffer);
+               return -EINVAL;
        }
-#endif
-       break;
-
-       case IOCTL_BCM_NVM_READ:
-       case IOCTL_BCM_NVM_WRITE: {
-               struct bcm_nvm_readwrite stNVMReadWrite;
-               PUCHAR pReadData = NULL;
-               ULONG ulDSDMagicNumInUsrBuff = 0;
-               struct timeval tv0, tv1;
-               memset(&tv0, 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");
-                       return -EFAULT;
-               }
 
-               if (IsFlash2x(Adapter)) {
-                       if ((Adapter->eActiveDSD != DSD0) &&
-                               (Adapter->eActiveDSD != DSD1) &&
-                               (Adapter->eActiveDSD != DSD2)) {
+       uiTempVar = pBulkBuffer->Register & EEPROM_REJECT_MASK;
+       if (!((Adapter->pstargetparams->m_u32Customize)&VSG_MODE) &&
+               ((uiTempVar == EEPROM_REJECT_REG_1) ||
+                       (uiTempVar == EEPROM_REJECT_REG_2) ||
+                       (uiTempVar == EEPROM_REJECT_REG_3) ||
+                       (uiTempVar == EEPROM_REJECT_REG_4)) &&
+               (cmd == IOCTL_BCM_REGISTER_WRITE)) {
 
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No DSD is active..hence NVM Command is blocked");
-                               return STATUS_FAILURE;
-                       }
-               }
+               kfree(pvBuffer);
+               BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "EEPROM Access Denied, not in VSG Mode\n");
+               return -EFAULT;
+       }
 
-               /* Copy Ioctl Buffer structure */
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       if (pBulkBuffer->SwapEndian == false)
+               Status = wrmWithLock(Adapter, (UINT)pBulkBuffer->Register, (PCHAR)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
+       else
+               Status = wrmaltWithLock(Adapter, (UINT)pBulkBuffer->Register, (PUINT)pBulkBuffer->Values, IoBuffer.InputLength - 2*sizeof(ULONG));
 
-               if (copy_from_user(&stNVMReadWrite,
-                                       (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
-                                       sizeof(struct bcm_nvm_readwrite)))
-                       return -EFAULT;
+       if (Status != STATUS_SUCCESS)
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "WRM Failed\n");
 
-               /*
-                * Deny the access if the offset crosses the cal area limit.
-                */
-               if (stNVMReadWrite.uiNumBytes > Adapter->uiNVMDSDSize)
-                       return STATUS_FAILURE;
+       kfree(pvBuffer);
+       return Status;
+}
 
-               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); */
-                       return STATUS_FAILURE;
-               }
+static int bcm_char_ioctl_get_nvm_size(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
 
-               pReadData = memdup_user(stNVMReadWrite.pBuffer,
-                                       stNVMReadWrite.uiNumBytes);
-               if (IS_ERR(pReadData))
-                       return PTR_ERR(pReadData);
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               do_gettimeofday(&tv0);
-               if (IOCTL_BCM_NVM_READ == cmd) {
-                       down(&Adapter->NVMRdmWrmLock);
+       if (Adapter->eNVMType == NVM_EEPROM || Adapter->eNVMType == NVM_FLASH) {
+               if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiNVMDSDSize, sizeof(UINT)))
+                       return -EFAULT;
+       }
 
-                       if ((Adapter->IdleMode == TRUE) ||
-                               (Adapter->bShutStatus == TRUE) ||
-                               (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       return STATUS_SUCCESS;
+}
 
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
-                               up(&Adapter->NVMRdmWrmLock);
-                               kfree(pReadData);
-                               return -EACCES;
-                       }
+static int bcm_char_ioctl_cal_init(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       UINT uiSectorSize = 0;
+       INT Status = STATUS_FAILURE;
 
-                       Status = BeceemNVMRead(Adapter, (PUINT)pReadData, stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes);
-                       up(&Adapter->NVMRdmWrmLock);
+       if (Adapter->eNVMType == NVM_FLASH) {
+               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+                       return -EFAULT;
 
-                       if (Status != STATUS_SUCCESS) {
-                               kfree(pReadData);
-                               return Status;
-                       }
+               if (copy_from_user(&uiSectorSize, IoBuffer.InputBuffer, sizeof(UINT)))
+                       return -EFAULT;
 
-                       if (copy_to_user(stNVMReadWrite.pBuffer, pReadData, stNVMReadWrite.uiNumBytes)) {
-                               kfree(pReadData);
+               if ((uiSectorSize < MIN_SECTOR_SIZE) || (uiSectorSize > MAX_SECTOR_SIZE)) {
+                       if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize,
+                                               sizeof(UINT)))
                                return -EFAULT;
-                       }
                } else {
-                       down(&Adapter->NVMRdmWrmLock);
-
-                       if ((Adapter->IdleMode == TRUE) ||
-                               (Adapter->bShutStatus == TRUE) ||
-                               (Adapter->bPreparingForLowPowerMode == TRUE)) {
-
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
-                               up(&Adapter->NVMRdmWrmLock);
-                               kfree(pReadData);
-                               return -EACCES;
-                       }
-
-                       Adapter->bHeaderChangeAllowed = TRUE;
                        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.
-                                *
-                                *                       This restriction has been put assuming that if DSD sig is corrupted, DSD
-                                *                       data won't be considered valid.
-                                */
-
-                               Status = BcmFlash2xCorruptSig(Adapter, Adapter->eActiveDSD);
-                               if (Status != STATUS_SUCCESS) {
-                                       if (((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) != Adapter->uiNVMDSDSize) ||
-                                               (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..");
-                                               up(&Adapter->NVMRdmWrmLock);
-                                               kfree(pReadData);
-                                               return Status;
-                                       }
-
-                                       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..");
-                                               up(&Adapter->NVMRdmWrmLock);
-                                               kfree(pReadData);
-                                               return Status;
-                                       }
+                               if (copy_to_user(IoBuffer.OutputBuffer, &Adapter->uiSectorSize, sizeof(UINT)))
+                                       return -EFAULT;
+                       } else {
+                               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;
                                }
+
+                               Adapter->uiSectorSize = uiSectorSize;
+                               BcmUpdateSectorSize(Adapter, Adapter->uiSectorSize);
                        }
+               }
+               Status = STATUS_SUCCESS;
+       } else {
+               Status = STATUS_FAILURE;
+       }
+       return Status;
+}
 
-                       Status = BeceemNVMWrite(Adapter, (PUINT)pReadData, stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes, stNVMReadWrite.bVerify);
-                       if (IsFlash2x(Adapter))
-                               BcmFlash2xWriteSig(Adapter, Adapter->eActiveDSD);
+static int bcm_char_ioctl_set_debug(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+#ifdef DEBUG
+       struct bcm_ioctl_buffer IoBuffer;
+       struct bcm_user_debug_state sUserDebugState;
 
-                       Adapter->bHeaderChangeAllowed = false;
+       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)))
+               return -EFAULT;
 
-                       up(&Adapter->NVMRdmWrmLock);
+       if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(struct bcm_user_debug_state)))
+               return -EFAULT;
 
-                       if (Status != STATUS_SUCCESS) {
-                               kfree(pReadData);
-                               return Status;
-                       }
-               }
+       BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ",
+                       sUserDebugState.OnOff, sUserDebugState.Type);
+       /* sUserDebugState.Subtype <<= 1; */
+       sUserDebugState.Subtype = 1 << sUserDebugState.Subtype;
+       BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "actual Subtype=0x%x\n", sUserDebugState.Subtype);
+
+       /* Update new 'DebugState' in the Adapter */
+       Adapter->stDebugState.type |= sUserDebugState.Type;
+       /* Subtype: A bitmap of 32 bits for Subtype per Type.
+        * Valid indexes in 'subtype' array: 1,2,4,8
+        * corresponding to valid Type values. Hence we can use the 'Type' field
+        * as the index value, ignoring the array entries 0,3,5,6,7 !
+        */
+       if (sUserDebugState.OnOff)
+               Adapter->stDebugState.subtype[sUserDebugState.Type] |= sUserDebugState.Subtype;
+       else
+               Adapter->stDebugState.subtype[sUserDebugState.Type] &= ~sUserDebugState.Subtype;
+
+       BCM_SHOW_DEBUG_BITMAP(Adapter);
+#endif
+       return STATUS_SUCCESS;
+}
 
-               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);
+static int bcm_char_ioctl_nvm_rw(void __user *argp, struct bcm_mini_adapter *Adapter, UINT cmd)
+{
+       struct bcm_nvm_readwrite stNVMReadWrite;
+       struct timeval tv0, tv1;
+       struct bcm_ioctl_buffer IoBuffer;
+       PUCHAR pReadData = NULL;
+       ULONG ulDSDMagicNumInUsrBuff = 0;
+       INT Status = STATUS_FAILURE;
 
-               kfree(pReadData);
-               return STATUS_SUCCESS;
+       memset(&tv0, 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");
+               return -EFAULT;
        }
 
-       case IOCTL_BCM_FLASH2X_SECTION_READ: {
-               struct bcm_flash2x_readwrite sFlash2xRead = {0};
-               PUCHAR pReadBuff = NULL;
-               UINT NOB = 0;
-               UINT BuffSize = 0;
-               UINT ReadBytes = 0;
-               UINT ReadOffset = 0;
-               void __user *OutPutBuff;
+       if (IsFlash2x(Adapter)) {
+               if ((Adapter->eActiveDSD != DSD0) &&
+                       (Adapter->eActiveDSD != DSD1) &&
+                       (Adapter->eActiveDSD != DSD2)) {
 
-               if (IsFlash2x(Adapter) != TRUE) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
-                       return -EINVAL;
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No DSD is active..hence NVM Command is blocked");
+                       return STATUS_FAILURE;
                }
+       }
 
-               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)))
-                       return -EFAULT;
+       /* Copy Ioctl Buffer structure */
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               /* Reading FLASH 2.x READ structure */
-               if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
-                       return -EFAULT;
+       if (copy_from_user(&stNVMReadWrite,
+                               (IOCTL_BCM_NVM_READ == cmd) ? IoBuffer.OutputBuffer : IoBuffer.InputBuffer,
+                               sizeof(struct bcm_nvm_readwrite)))
+               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);
+       /*
+        * Deny the access if the offset crosses the cal area limit.
+        */
+       if (stNVMReadWrite.uiNumBytes > Adapter->uiNVMDSDSize)
+               return STATUS_FAILURE;
 
-               /* This was internal to driver for raw read. now it has ben exposed to user space app. */
-               if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == false)
-                       return STATUS_FAILURE;
+       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); */
+               return STATUS_FAILURE;
+       }
 
-               NOB = sFlash2xRead.numOfBytes;
-               if (NOB > Adapter->uiSectorSize)
-                       BuffSize = Adapter->uiSectorSize;
-               else
-                       BuffSize = NOB;
+       pReadData = memdup_user(stNVMReadWrite.pBuffer,
+                               stNVMReadWrite.uiNumBytes);
+       if (IS_ERR(pReadData))
+               return PTR_ERR(pReadData);
+
+       do_gettimeofday(&tv0);
+       if (IOCTL_BCM_NVM_READ == cmd) {
+               down(&Adapter->NVMRdmWrmLock);
+
+               if ((Adapter->IdleMode == TRUE) ||
+                       (Adapter->bShutStatus == TRUE) ||
+                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+                       up(&Adapter->NVMRdmWrmLock);
+                       kfree(pReadData);
+                       return -EACCES;
+               }
 
-               ReadOffset = sFlash2xRead.offset;
-               OutPutBuff = IoBuffer.OutputBuffer;
-               pReadBuff = (PCHAR)kzalloc(BuffSize , GFP_KERNEL);
+               Status = BeceemNVMRead(Adapter, (PUINT)pReadData, stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes);
+               up(&Adapter->NVMRdmWrmLock);
+
+               if (Status != STATUS_SUCCESS) {
+                       kfree(pReadData);
+                       return Status;
+               }
 
-               if (pReadBuff == NULL) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed for Flash 2.x Read Structure");
-                       return -ENOMEM;
+               if (copy_to_user(stNVMReadWrite.pBuffer, pReadData, stNVMReadWrite.uiNumBytes)) {
+                       kfree(pReadData);
+                       return -EFAULT;
                }
+       } else {
                down(&Adapter->NVMRdmWrmLock);
 
                if ((Adapter->IdleMode == TRUE) ||
@@ -1506,544 +1376,930 @@ cntrlEnd:
 
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
                        up(&Adapter->NVMRdmWrmLock);
-                       kfree(pReadBuff);
+                       kfree(pReadData);
                        return -EACCES;
                }
 
-               while (NOB) {
-                       if (NOB > Adapter->uiSectorSize)
-                               ReadBytes = Adapter->uiSectorSize;
-                       else
-                               ReadBytes = NOB;
+               Adapter->bHeaderChangeAllowed = TRUE;
+               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.
+                        *
+                        *                       This restriction has been put assuming that if DSD sig is corrupted, DSD
+                        *                       data won't be considered valid.
+                        */
 
-                       /* Reading the data from Flash 2.x */
-                       Status = BcmFlash2xBulkRead(Adapter, (PUINT)pReadBuff, sFlash2xRead.Section, ReadOffset, ReadBytes);
-                       if (Status) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Flash 2x read err with Status :%d", Status);
-                               break;
-                       }
+                       Status = BcmFlash2xCorruptSig(Adapter, Adapter->eActiveDSD);
+                       if (Status != STATUS_SUCCESS) {
+                               if (((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) != Adapter->uiNVMDSDSize) ||
+                                       (stNVMReadWrite.uiNumBytes < SIGNATURE_SIZE)) {
 
-                       BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pReadBuff, ReadBytes);
+                                       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);
+                                       kfree(pReadData);
+                                       return Status;
+                               }
 
-                       Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
-                       if (Status) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy to use failed with status :%d", Status);
-                               up(&Adapter->NVMRdmWrmLock);
-                               kfree(pReadBuff);
-                               return -EFAULT;
-                       }
-                       NOB = NOB - ReadBytes;
-                       if (NOB) {
-                               ReadOffset = ReadOffset + ReadBytes;
-                               OutPutBuff = OutPutBuff + ReadBytes;
+                               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..");
+                                       up(&Adapter->NVMRdmWrmLock);
+                                       kfree(pReadData);
+                                       return Status;
+                               }
                        }
                }
 
-               up(&Adapter->NVMRdmWrmLock);
-               kfree(pReadBuff);
-       }
-       break;
+               Status = BeceemNVMWrite(Adapter, (PUINT)pReadData, stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes, stNVMReadWrite.bVerify);
+               if (IsFlash2x(Adapter))
+                       BcmFlash2xWriteSig(Adapter, Adapter->eActiveDSD);
 
-       case IOCTL_BCM_FLASH2X_SECTION_WRITE: {
-               struct bcm_flash2x_readwrite sFlash2xWrite = {0};
-               PUCHAR pWriteBuff;
-               void __user *InputAddr;
-               UINT NOB = 0;
-               UINT BuffSize = 0;
-               UINT WriteOffset = 0;
-               UINT WriteBytes = 0;
+               Adapter->bHeaderChangeAllowed = false;
 
-               if (IsFlash2x(Adapter) != TRUE) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
-                       return -EINVAL;
+               up(&Adapter->NVMRdmWrmLock);
+
+               if (Status != STATUS_SUCCESS) {
+                       kfree(pReadData);
+                       return Status;
                }
+       }
 
-               /* First make this False so that we can enable the Sector Permission Check in BeceemFlashBulkWrite */
-               Adapter->bAllDSDWriteAllow = false;
+       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, "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
+       kfree(pReadData);
+       return STATUS_SUCCESS;
+}
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+static int bcm_char_ioctl_flash2x_section_read(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_flash2x_readwrite sFlash2xRead = {0};
+       struct bcm_ioctl_buffer IoBuffer;
+       PUCHAR pReadBuff = NULL;
+       UINT NOB = 0;
+       UINT BuffSize = 0;
+       UINT ReadBytes = 0;
+       UINT ReadOffset = 0;
+       INT Status = STATUS_FAILURE;
+       void __user *OutPutBuff;
 
-               /* Reading FLASH 2.x READ structure */
-               if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
-                       return -EFAULT;
+       if (IsFlash2x(Adapter) != TRUE) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
+               return -EINVAL;
+       }
 
-               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, "IOCTL_BCM_FLASH2X_SECTION_READ Called");
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
 
-               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;
-               }
+       /* Reading FLASH 2.x READ structure */
+       if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
+               return -EFAULT;
 
-               if (validateFlash2xReadWrite(Adapter, &sFlash2xWrite) == false)
-                       return STATUS_FAILURE;
+       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);
 
-               InputAddr = sFlash2xWrite.pDataBuff;
-               WriteOffset = sFlash2xWrite.offset;
-               NOB = sFlash2xWrite.numOfBytes;
+       /* This was internal to driver for raw read. now it has ben exposed to user space app. */
+       if (validateFlash2xReadWrite(Adapter, &sFlash2xRead) == false)
+               return STATUS_FAILURE;
 
-               if (NOB > Adapter->uiSectorSize)
-                       BuffSize = Adapter->uiSectorSize;
-               else
-                       BuffSize = NOB;
+       NOB = sFlash2xRead.numOfBytes;
+       if (NOB > Adapter->uiSectorSize)
+               BuffSize = Adapter->uiSectorSize;
+       else
+               BuffSize = NOB;
 
-               pWriteBuff = kmalloc(BuffSize, GFP_KERNEL);
+       ReadOffset = sFlash2xRead.offset;
+       OutPutBuff = IoBuffer.OutputBuffer;
+       pReadBuff = (PCHAR)kzalloc(BuffSize , GFP_KERNEL);
 
-               if (pWriteBuff == NULL)
-                       return -ENOMEM;
+       if (pReadBuff == NULL) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed for Flash 2.x Read Structure");
+               return -ENOMEM;
+       }
+       down(&Adapter->NVMRdmWrmLock);
 
-               /* extracting the remainder of the given offset. */
-               WriteBytes = Adapter->uiSectorSize;
-               if (WriteOffset % Adapter->uiSectorSize)
-                       WriteBytes = Adapter->uiSectorSize - (WriteOffset % Adapter->uiSectorSize);
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-               if (NOB < WriteBytes)
-                       WriteBytes = NOB;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+               up(&Adapter->NVMRdmWrmLock);
+               kfree(pReadBuff);
+               return -EACCES;
+       }
 
-               down(&Adapter->NVMRdmWrmLock);
+       while (NOB) {
+               if (NOB > Adapter->uiSectorSize)
+                       ReadBytes = Adapter->uiSectorSize;
+               else
+                       ReadBytes = NOB;
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+               /* Reading the data from Flash 2.x */
+               Status = BcmFlash2xBulkRead(Adapter, (PUINT)pReadBuff, sFlash2xRead.Section, ReadOffset, ReadBytes);
+               if (Status) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Flash 2x read err with Status :%d", Status);
+                       break;
+               }
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+               BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pReadBuff, ReadBytes);
+
+               Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
+               if (Status) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy to use failed with status :%d", Status);
                        up(&Adapter->NVMRdmWrmLock);
-                       kfree(pWriteBuff);
-                       return -EACCES;
+                       kfree(pReadBuff);
+                       return -EFAULT;
                }
+               NOB = NOB - ReadBytes;
+               if (NOB) {
+                       ReadOffset = ReadOffset + ReadBytes;
+                       OutPutBuff = OutPutBuff + ReadBytes;
+               }
+       }
 
-               BcmFlash2xCorruptSig(Adapter, sFlash2xWrite.Section);
-               do {
-                       Status = copy_from_user(pWriteBuff, InputAddr, WriteBytes);
-                       if (Status) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to user failed with status :%d", Status);
-                               up(&Adapter->NVMRdmWrmLock);
-                               kfree(pWriteBuff);
-                               return -EFAULT;
-                       }
-                       BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pWriteBuff, WriteBytes);
+       up(&Adapter->NVMRdmWrmLock);
+       kfree(pReadBuff);
+       return Status;
+}
 
-                       /* Writing the data from Flash 2.x */
-                       Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff, sFlash2xWrite.Section, WriteOffset, WriteBytes, sFlash2xWrite.bVerify);
+static int bcm_char_ioctl_flash2x_section_write(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_flash2x_readwrite sFlash2xWrite = {0};
+       struct bcm_ioctl_buffer IoBuffer;
+       PUCHAR pWriteBuff;
+       void __user *InputAddr;
+       UINT NOB = 0;
+       UINT BuffSize = 0;
+       UINT WriteOffset = 0;
+       UINT WriteBytes = 0;
+       INT Status = STATUS_FAILURE;
 
-                       if (Status) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash 2x read err with Status :%d", Status);
-                               break;
-                       }
+       if (IsFlash2x(Adapter) != TRUE) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
+               return -EINVAL;
+       }
 
-                       NOB = NOB - WriteBytes;
-                       if (NOB) {
-                               WriteOffset = WriteOffset + WriteBytes;
-                               InputAddr = InputAddr + WriteBytes;
-                               if (NOB > Adapter->uiSectorSize)
-                                       WriteBytes = Adapter->uiSectorSize;
-                               else
-                                       WriteBytes = NOB;
-                       }
-               } while (NOB > 0);
+       /* First make this False so that we can enable the Sector Permission Check in BeceemFlashBulkWrite */
+       Adapter->bAllDSDWriteAllow = false;
 
-               BcmFlash2xWriteSig(Adapter, sFlash2xWrite.Section);
-               up(&Adapter->NVMRdmWrmLock);
-               kfree(pWriteBuff);
-       }
-       break;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_FLASH2X_SECTION_WRITE Called");
 
-       case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP: {
-               struct bcm_flash2x_bitmap *psFlash2xBitMap;
-               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)))
+               return -EFAULT;
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       /* Reading FLASH 2.x READ structure */
+       if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))
+               return -EFAULT;
 
-               if (IoBuffer.OutputLength != sizeof(struct bcm_flash2x_bitmap))
-                       return -EINVAL;
+       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);
 
-               psFlash2xBitMap = kzalloc(sizeof(struct bcm_flash2x_bitmap), GFP_KERNEL);
-               if (psFlash2xBitMap == NULL) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory is not available");
-                       return -ENOMEM;
-               }
+       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;
+       }
 
-               /* Reading the Flash Sectio Bit map */
-               down(&Adapter->NVMRdmWrmLock);
+       if (validateFlash2xReadWrite(Adapter, &sFlash2xWrite) == false)
+               return STATUS_FAILURE;
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       InputAddr = sFlash2xWrite.pDataBuff;
+       WriteOffset = sFlash2xWrite.offset;
+       NOB = sFlash2xWrite.numOfBytes;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
-                       up(&Adapter->NVMRdmWrmLock);
-                       kfree(psFlash2xBitMap);
-                       return -EACCES;
-               }
+       if (NOB > Adapter->uiSectorSize)
+               BuffSize = Adapter->uiSectorSize;
+       else
+               BuffSize = NOB;
 
-               BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
-               up(&Adapter->NVMRdmWrmLock);
-               if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(struct bcm_flash2x_bitmap))) {
-                       kfree(psFlash2xBitMap);
-                       return -EFAULT;
-               }
+       pWriteBuff = kmalloc(BuffSize, GFP_KERNEL);
 
-               kfree(psFlash2xBitMap);
-       }
-       break;
+       if (pWriteBuff == NULL)
+               return -ENOMEM;
 
-       case IOCTL_BCM_SET_ACTIVE_SECTION: {
-               enum bcm_flash2x_section_val eFlash2xSectionVal = 0;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");
+       /* extracting the remainder of the given offset. */
+       WriteBytes = Adapter->uiSectorSize;
+       if (WriteOffset % Adapter->uiSectorSize)
+               WriteBytes = Adapter->uiSectorSize - (WriteOffset % Adapter->uiSectorSize);
 
-               if (IsFlash2x(Adapter) != TRUE) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
-                       return -EINVAL;
-               }
+       if (NOB < WriteBytes)
+               WriteBytes = NOB;
+
+       down(&Adapter->NVMRdmWrmLock);
+
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-               Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+               up(&Adapter->NVMRdmWrmLock);
+               kfree(pWriteBuff);
+               return -EACCES;
+       }
+
+       BcmFlash2xCorruptSig(Adapter, sFlash2xWrite.Section);
+       do {
+               Status = copy_from_user(pWriteBuff, InputAddr, WriteBytes);
                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 to user failed with status :%d", Status);
+                       up(&Adapter->NVMRdmWrmLock);
+                       kfree(pWriteBuff);
                        return -EFAULT;
                }
+               BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pWriteBuff, WriteBytes);
+
+               /* Writing the data from Flash 2.x */
+               Status = BcmFlash2xBulkWrite(Adapter, (PUINT)pWriteBuff, sFlash2xWrite.Section, WriteOffset, WriteBytes, sFlash2xWrite.bVerify);
 
-               Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
                if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
-                       return -EFAULT;
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash 2x read err with Status :%d", Status);
+                       break;
                }
 
-               down(&Adapter->NVMRdmWrmLock);
+               NOB = NOB - WriteBytes;
+               if (NOB) {
+                       WriteOffset = WriteOffset + WriteBytes;
+                       InputAddr = InputAddr + WriteBytes;
+                       if (NOB > Adapter->uiSectorSize)
+                               WriteBytes = Adapter->uiSectorSize;
+                       else
+                               WriteBytes = NOB;
+               }
+       } while (NOB > 0);
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       BcmFlash2xWriteSig(Adapter, sFlash2xWrite.Section);
+       up(&Adapter->NVMRdmWrmLock);
+       kfree(pWriteBuff);
+       return Status;
+}
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
-                       up(&Adapter->NVMRdmWrmLock);
-                       return -EACCES;
-               }
+static int bcm_char_ioctl_flash2x_section_bitmap(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_flash2x_bitmap *psFlash2xBitMap;
+       struct bcm_ioctl_buffer IoBuffer;
+       INT Status = STATUS_FAILURE;
+
+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)))
+               return -EFAULT;
+
+       if (IoBuffer.OutputLength != sizeof(struct bcm_flash2x_bitmap))
+               return -EINVAL;
 
-               Status = BcmSetActiveSection(Adapter, eFlash2xSectionVal);
-               if (Status)
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Failed to make it's priority Highest. Status %d", Status);
+       psFlash2xBitMap = kzalloc(sizeof(struct bcm_flash2x_bitmap), GFP_KERNEL);
+       if (psFlash2xBitMap == NULL) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory is not available");
+               return -ENOMEM;
+       }
+
+       /* Reading the Flash Sectio Bit map */
+       down(&Adapter->NVMRdmWrmLock);
+
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
                up(&Adapter->NVMRdmWrmLock);
+               kfree(psFlash2xBitMap);
+               return -EACCES;
        }
-       break;
 
-       case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION: {
-               /* Right Now we are taking care of only DSD */
-               Adapter->bAllDSDWriteAllow = false;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
-               Status = STATUS_SUCCESS;
+       BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
+       up(&Adapter->NVMRdmWrmLock);
+       if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(struct bcm_flash2x_bitmap))) {
+               kfree(psFlash2xBitMap);
+               return -EFAULT;
        }
-       break;
 
-       case IOCTL_BCM_COPY_SECTION: {
-               struct bcm_flash2x_copy_section sCopySectStrut = {0};
-               Status = STATUS_SUCCESS;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION  Called");
+       kfree(psFlash2xBitMap);
+       return Status;
+}
 
-               Adapter->bAllDSDWriteAllow = false;
-               if (IsFlash2x(Adapter) != TRUE) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
-                       return -EINVAL;
-               }
+static int bcm_char_ioctl_set_active_section(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       enum bcm_flash2x_section_val eFlash2xSectionVal = 0;
+       INT Status = STATUS_FAILURE;
+       struct bcm_ioctl_buffer IoBuffer;
 
-               Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);
-                       return -EFAULT;
-               }
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SET_ACTIVE_SECTION Called");
 
-               Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_copy_section));
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
-                       return -EFAULT;
-               }
+       if (IsFlash2x(Adapter) != TRUE) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
+               return -EINVAL;
+       }
 
-               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);
+       Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+               return -EFAULT;
+       }
 
-               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);
-                       return -EINVAL;
-               }
+       Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
+               return -EFAULT;
+       }
 
-               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);
-                       return -EINVAL;
-               }
+       down(&Adapter->NVMRdmWrmLock);
 
-               if (sCopySectStrut.SrcSection == sCopySectStrut.DstSection) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source and Destination section should be different");
-                       return -EINVAL;
-               }
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-               down(&Adapter->NVMRdmWrmLock);
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+               up(&Adapter->NVMRdmWrmLock);
+               return -EACCES;
+       }
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       Status = BcmSetActiveSection(Adapter, eFlash2xSectionVal);
+       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_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
-                       up(&Adapter->NVMRdmWrmLock);
-                       return -EACCES;
-               }
+       up(&Adapter->NVMRdmWrmLock);
 
-               if (sCopySectStrut.SrcSection == ISO_IMAGE1 || sCopySectStrut.SrcSection == ISO_IMAGE2) {
-                       if (IsNonCDLessDevice(Adapter)) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Device is Non-CDLess hence won't have ISO !!");
-                               Status = -EINVAL;
-                       } else if (sCopySectStrut.numOfBytes == 0) {
-                               Status = BcmCopyISO(Adapter, sCopySectStrut);
-                       } else {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Partial Copy of ISO section is not Allowed..");
-                               Status = STATUS_FAILURE;
-                       }
-                       up(&Adapter->NVMRdmWrmLock);
-                       return Status;
-               }
+       return Status;
+}
 
-               Status = BcmCopySection(Adapter, sCopySectStrut.SrcSection,
-                                       sCopySectStrut.DstSection, sCopySectStrut.offset, sCopySectStrut.numOfBytes);
-               up(&Adapter->NVMRdmWrmLock);
+static int bcm_char_ioctl_copy_section(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_flash2x_copy_section sCopySectStrut = {0};
+       struct bcm_ioctl_buffer IoBuffer;
+       INT Status = STATUS_SUCCESS;
+
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION  Called");
+
+       Adapter->bAllDSDWriteAllow = false;
+       if (IsFlash2x(Adapter) != TRUE) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
+               return -EINVAL;
        }
-       break;
 
-       case IOCTL_BCM_GET_FLASH_CS_INFO: {
-               Status = STATUS_SUCCESS;
-               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));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);
+               return -EFAULT;
+       }
 
-               Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                       return -EFAULT;
-               }
+       Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_copy_section));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
+               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);
+
+       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);
+               return -EINVAL;
+       }
+
+       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);
+               return -EINVAL;
+       }
+
+       if (sCopySectStrut.SrcSection == sCopySectStrut.DstSection) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source and Destination section should be different");
+               return -EINVAL;
+       }
+
+       down(&Adapter->NVMRdmWrmLock);
+
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
+
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
+               up(&Adapter->NVMRdmWrmLock);
+               return -EACCES;
+       }
 
-               if (Adapter->eNVMType != NVM_FLASH) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Connected device does not have flash");
+       if (sCopySectStrut.SrcSection == ISO_IMAGE1 || sCopySectStrut.SrcSection == ISO_IMAGE2) {
+               if (IsNonCDLessDevice(Adapter)) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Device is Non-CDLess hence won't have ISO !!");
                        Status = -EINVAL;
-                       break;
+               } else if (sCopySectStrut.numOfBytes == 0) {
+                       Status = BcmCopyISO(Adapter, sCopySectStrut);
+               } else {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Partial Copy of ISO section is not Allowed..");
+                       Status = STATUS_FAILURE;
                }
+               up(&Adapter->NVMRdmWrmLock);
+               return Status;
+       }
 
-               if (IsFlash2x(Adapter) == TRUE) {
-                       if (IoBuffer.OutputLength < sizeof(struct bcm_flash2x_cs_info))
-                               return -EINVAL;
+       Status = BcmCopySection(Adapter, sCopySectStrut.SrcSection,
+                               sCopySectStrut.DstSection, sCopySectStrut.offset, sCopySectStrut.numOfBytes);
+       up(&Adapter->NVMRdmWrmLock);
+       return Status;
+}
 
-                       if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlash2xCSInfo, sizeof(struct bcm_flash2x_cs_info)))
-                               return -EFAULT;
-               } else {
-                       if (IoBuffer.OutputLength < sizeof(struct bcm_flash_cs_info))
-                               return -EINVAL;
+static int bcm_char_ioctl_get_flash_cs_info(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       INT Status = STATUS_SUCCESS;
 
-                       if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo, sizeof(struct bcm_flash_cs_info)))
-                               return -EFAULT;
-               }
+       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));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+               return -EFAULT;
        }
-       break;
 
-       case IOCTL_BCM_SELECT_DSD: {
-               UINT SectOfset = 0;
-               enum bcm_flash2x_section_val eFlash2xSectionVal;
-               eFlash2xSectionVal = NO_SECTION_VAL;
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SELECT_DSD Called");
+       if (Adapter->eNVMType != NVM_FLASH) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Connected device does not have flash");
+               return -EINVAL;
+       }
 
-               if (IsFlash2x(Adapter) != TRUE) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
+       if (IsFlash2x(Adapter) == TRUE) {
+               if (IoBuffer.OutputLength < sizeof(struct bcm_flash2x_cs_info))
                        return -EINVAL;
-               }
 
-               Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+               if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlash2xCSInfo, sizeof(struct bcm_flash2x_cs_info)))
                        return -EFAULT;
-               }
-               Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
+       } else {
+               if (IoBuffer.OutputLength < sizeof(struct bcm_flash_cs_info))
+                       return -EINVAL;
+
+               if (copy_to_user(IoBuffer.OutputBuffer, Adapter->psFlashCSInfo, sizeof(struct bcm_flash_cs_info)))
                        return -EFAULT;
-               }
+       }
+       return Status;
+}
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read Section :%d", eFlash2xSectionVal);
-               if ((eFlash2xSectionVal != DSD0) &&
-                       (eFlash2xSectionVal != DSD1) &&
-                       (eFlash2xSectionVal != DSD2)) {
+static int bcm_char_ioctl_select_dsd(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_ioctl_buffer IoBuffer;
+       INT Status = STATUS_FAILURE;
+       UINT SectOfset = 0;
+       enum bcm_flash2x_section_val eFlash2xSectionVal;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Passed section<%x> is not DSD section", eFlash2xSectionVal);
-                       return STATUS_FAILURE;
-               }
+       eFlash2xSectionVal = NO_SECTION_VAL;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_SELECT_DSD Called");
 
-               SectOfset = BcmGetSectionValStartOffset(Adapter, eFlash2xSectionVal);
-               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);
-                       return -EINVAL;
-               }
+       if (IsFlash2x(Adapter) != TRUE) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash Does not have 2.x map");
+               return -EINVAL;
+       }
 
-               Adapter->bAllDSDWriteAllow = TRUE;
-               Adapter->ulFlashCalStart = SectOfset;
-               Adapter->eActiveDSD = eFlash2xSectionVal;
+       Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
+               return -EFAULT;
+       }
+       Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
+               return -EFAULT;
        }
-       Status = STATUS_SUCCESS;
-       break;
 
-       case IOCTL_BCM_NVM_RAW_READ: {
-               struct bcm_nvm_readwrite stNVMRead;
-               INT NOB;
-               INT BuffSize;
-               INT ReadOffset = 0;
-               UINT ReadBytes = 0;
-               PUCHAR pReadBuff;
-               void __user *OutPutBuff;
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read Section :%d", eFlash2xSectionVal);
+       if ((eFlash2xSectionVal != DSD0) &&
+               (eFlash2xSectionVal != DSD1) &&
+               (eFlash2xSectionVal != DSD2)) {
 
-               if (Adapter->eNVMType != NVM_FLASH) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "NVM TYPE is not Flash");
-                       return -EINVAL;
-               }
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Passed section<%x> is not DSD section", eFlash2xSectionVal);
+               return STATUS_FAILURE;
+       }
 
-               /* Copy Ioctl Buffer structure */
-               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");
-                       return -EFAULT;
-               }
+       SectOfset = BcmGetSectionValStartOffset(Adapter, eFlash2xSectionVal);
+       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);
+               return -EINVAL;
+       }
 
-               if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(struct bcm_nvm_readwrite)))
-                       return -EFAULT;
+       Adapter->bAllDSDWriteAllow = TRUE;
+       Adapter->ulFlashCalStart = SectOfset;
+       Adapter->eActiveDSD = eFlash2xSectionVal;
 
-               NOB = stNVMRead.uiNumBytes;
-               /* In Raw-Read max Buff size : 64MB */
+       return STATUS_SUCCESS;
+}
 
-               if (NOB > DEFAULT_BUFF_SIZE)
-                       BuffSize = DEFAULT_BUFF_SIZE;
-               else
-                       BuffSize = NOB;
+static int bcm_char_ioctl_nvm_raw_read(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_nvm_readwrite stNVMRead;
+       struct bcm_ioctl_buffer IoBuffer;
+       INT NOB;
+       INT BuffSize;
+       INT ReadOffset = 0;
+       UINT ReadBytes = 0;
+       PUCHAR pReadBuff;
+       void __user *OutPutBuff;
+       INT Status = STATUS_FAILURE;
 
-               ReadOffset = stNVMRead.uiOffset;
-               OutPutBuff = stNVMRead.pBuffer;
+       if (Adapter->eNVMType != NVM_FLASH) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "NVM TYPE is not Flash");
+               return -EINVAL;
+       }
 
-               pReadBuff = kzalloc(BuffSize , GFP_KERNEL);
-               if (pReadBuff == NULL) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed for Flash 2.x Read Structure");
-                       Status = -ENOMEM;
-                       break;
-               }
-               down(&Adapter->NVMRdmWrmLock);
+       /* Copy Ioctl Buffer structure */
+       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");
+               return -EFAULT;
+       }
 
-               if ((Adapter->IdleMode == TRUE) ||
-                       (Adapter->bShutStatus == TRUE) ||
-                       (Adapter->bPreparingForLowPowerMode == TRUE)) {
+       if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(struct bcm_nvm_readwrite)))
+               return -EFAULT;
 
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
-                       kfree(pReadBuff);
-                       up(&Adapter->NVMRdmWrmLock);
-                       return -EACCES;
-               }
+       NOB = stNVMRead.uiNumBytes;
+       /* In Raw-Read max Buff size : 64MB */
 
-               Adapter->bFlashRawRead = TRUE;
+       if (NOB > DEFAULT_BUFF_SIZE)
+               BuffSize = DEFAULT_BUFF_SIZE;
+       else
+               BuffSize = NOB;
 
-               while (NOB) {
-                       if (NOB > DEFAULT_BUFF_SIZE)
-                               ReadBytes = DEFAULT_BUFF_SIZE;
-                       else
-                               ReadBytes = NOB;
+       ReadOffset = stNVMRead.uiOffset;
+       OutPutBuff = stNVMRead.pBuffer;
 
-                       /* Reading the data from Flash 2.x */
-                       Status = BeceemNVMRead(Adapter, (PUINT)pReadBuff, ReadOffset, ReadBytes);
-                       if (Status) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash 2x read err with Status :%d", Status);
-                               break;
-                       }
+       pReadBuff = kzalloc(BuffSize , GFP_KERNEL);
+       if (pReadBuff == NULL) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Memory allocation failed for Flash 2.x Read Structure");
+               return -ENOMEM;
+       }
+       down(&Adapter->NVMRdmWrmLock);
 
-                       BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pReadBuff, ReadBytes);
+       if ((Adapter->IdleMode == TRUE) ||
+               (Adapter->bShutStatus == TRUE) ||
+               (Adapter->bPreparingForLowPowerMode == TRUE)) {
 
-                       Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
-                       if (Status) {
-                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to use failed with status :%d", Status);
-                               up(&Adapter->NVMRdmWrmLock);
-                               kfree(pReadBuff);
-                               return -EFAULT;
-                       }
-                       NOB = NOB - ReadBytes;
-                       if (NOB) {
-                               ReadOffset = ReadOffset + ReadBytes;
-                               OutPutBuff = OutPutBuff + ReadBytes;
-                       }
-               }
-               Adapter->bFlashRawRead = false;
-               up(&Adapter->NVMRdmWrmLock);
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n");
                kfree(pReadBuff);
-               break;
+               up(&Adapter->NVMRdmWrmLock);
+               return -EACCES;
        }
 
-       case IOCTL_BCM_CNTRLMSG_MASK: {
-               ULONG RxCntrlMsgBitMask = 0;
+       Adapter->bFlashRawRead = TRUE;
 
-               /* Copy Ioctl Buffer structure */
-               Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
-               if (Status) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");
-                       return -EFAULT;
-               }
+       while (NOB) {
+               if (NOB > DEFAULT_BUFF_SIZE)
+                       ReadBytes = DEFAULT_BUFF_SIZE;
+               else
+                       ReadBytes = NOB;
 
-               if (IoBuffer.InputLength != sizeof(unsigned long)) {
-                       Status = -EINVAL;
+               /* Reading the data from Flash 2.x */
+               Status = BeceemNVMRead(Adapter, (PUINT)pReadBuff, ReadOffset, ReadBytes);
+               if (Status) {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Flash 2x read err with Status :%d", Status);
                        break;
                }
 
-               Status = copy_from_user(&RxCntrlMsgBitMask, IoBuffer.InputBuffer, IoBuffer.InputLength);
+               BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pReadBuff, ReadBytes);
+
+               Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
                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_PRINTK, 0, 0, "Copy to use failed with status :%d", Status);
+                       up(&Adapter->NVMRdmWrmLock);
+                       kfree(pReadBuff);
                        return -EFAULT;
                }
-               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;
+               NOB = NOB - ReadBytes;
+               if (NOB) {
+                       ReadOffset = ReadOffset + ReadBytes;
+                       OutPutBuff = OutPutBuff + ReadBytes;
+               }
        }
-       break;
+       Adapter->bFlashRawRead = false;
+       up(&Adapter->NVMRdmWrmLock);
+       kfree(pReadBuff);
+       return Status;
+}
 
-       case IOCTL_BCM_GET_DEVICE_DRIVER_INFO: {
-               struct bcm_driver_info DevInfo;
+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;
+       INT Status = STATUS_FAILURE;
+       ULONG RxCntrlMsgBitMask = 0;
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
+       /* Copy Ioctl Buffer structure */
+       Status = copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer));
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");
+               return -EFAULT;
+       }
 
-               memset(&DevInfo, 0, sizeof(DevInfo));
-               DevInfo.MaxRDMBufferSize = BUFFER_4K;
-               DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;
-               DevInfo.u32RxAlignmentCorrection = 0;
-               DevInfo.u32NVMType = Adapter->eNVMType;
-               DevInfo.u32InterfaceType = BCM_USB;
+       if (IoBuffer.InputLength != sizeof(unsigned long))
+               return -EINVAL;
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       Status = copy_from_user(&RxCntrlMsgBitMask, IoBuffer.InputBuffer, IoBuffer.InputLength);
+       if (Status) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of control bit mask failed from user space");
+               return -EFAULT;
+       }
+       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;
 
-               if (IoBuffer.OutputLength < sizeof(DevInfo))
-                       return -EINVAL;
+       return Status;
+}
 
-               if (copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo)))
-                       return -EFAULT;
+static int bcm_char_ioctl_get_device_driver_info(void __user *argp, struct bcm_mini_adapter *Adapter)
+{
+       struct bcm_driver_info DevInfo;
+       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");
+
+       memset(&DevInfo, 0, sizeof(DevInfo));
+       DevInfo.MaxRDMBufferSize = BUFFER_4K;
+       DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;
+       DevInfo.u32RxAlignmentCorrection = 0;
+       DevInfo.u32NVMType = Adapter->eNVMType;
+       DevInfo.u32InterfaceType = BCM_USB;
+
+       if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+               return -EFAULT;
+
+       if (IoBuffer.OutputLength < sizeof(DevInfo))
+               return -EINVAL;
+
+       if (copy_to_user(IoBuffer.OutputBuffer, &DevInfo, sizeof(DevInfo)))
+               return -EFAULT;
+
+       return STATUS_SUCCESS;
+}
+
+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_ioctl_buffer IoBuffer;
+
+       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)))
+               return -EFAULT;
+
+       if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
+               return -EINVAL;
+
+       stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;
+
+       if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))
+               return -EFAULT;
+
+       return STATUS_SUCCESS;
+}
+
+
+static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
+{
+       struct bcm_tarang_data *pTarang = filp->private_data;
+       void __user *argp = (void __user *)arg;
+       struct bcm_mini_adapter *Adapter = pTarang->Adapter;
+       INT Status = STATUS_FAILURE;
+
+       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+                       "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX",
+                       cmd, arg);
+
+       if (_IOC_TYPE(cmd) != BCM_IOCTL)
+               return -EFAULT;
+       if (_IOC_DIR(cmd) & _IOC_READ)
+               Status = !access_ok(VERIFY_WRITE, argp, _IOC_SIZE(cmd));
+       else if (_IOC_DIR(cmd) & _IOC_WRITE)
+               Status = !access_ok(VERIFY_READ, argp, _IOC_SIZE(cmd));
+       else if (_IOC_NONE == (_IOC_DIR(cmd) & _IOC_NONE))
+               Status = STATUS_SUCCESS;
+
+       if (Status)
+               return -EFAULT;
+
+       if (Adapter->device_removed)
+               return -EFAULT;
+
+       if (false == Adapter->fw_download_done) {
+               switch (cmd) {
+               case IOCTL_MAC_ADDR_REQ:
+               case IOCTL_LINK_REQ:
+               case IOCTL_CM_REQUEST:
+               case IOCTL_SS_INFO_REQ:
+               case IOCTL_SEND_CONTROL_MESSAGE:
+               case IOCTL_IDLE_REQ:
+               case IOCTL_BCM_GPIO_SET_REQUEST:
+               case IOCTL_BCM_GPIO_STATUS_REQUEST:
+                       return -EACCES;
+               default:
+                       break;
+               }
        }
-       break;
 
-       case IOCTL_BCM_TIME_SINCE_NET_ENTRY: {
-               struct bcm_time_elapsed stTimeElapsedSinceNetEntry = {0};
+       Status = vendorextnIoctl(Adapter, cmd, arg);
+       if (Status != CONTINUE_COMMON_PATH)
+               return Status;
+
+       switch (cmd) {
+       /* Rdms for Swin Idle... */
+       case IOCTL_BCM_REGISTER_READ_PRIVATE:
+               Status = bcm_char_ioctl_reg_read_private(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_REGISTER_WRITE_PRIVATE:
+               Status = bcm_char_ioctl_reg_write_private(argp, Adapter);
+               return Status;
 
-               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_TIME_SINCE_NET_ENTRY called");
+       case IOCTL_BCM_REGISTER_READ:
+       case IOCTL_BCM_EEPROM_REGISTER_READ:
+               Status = bcm_char_ioctl_eeprom_reg_read(argp, Adapter);
+               return Status;
 
-               if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
-                       return -EFAULT;
+       case IOCTL_BCM_REGISTER_WRITE:
+       case IOCTL_BCM_EEPROM_REGISTER_WRITE:
+               Status = bcm_char_ioctl_eeprom_reg_write(argp, Adapter, cmd);
+               return Status;
 
-               if (IoBuffer.OutputLength < sizeof(struct bcm_time_elapsed))
-                       return -EINVAL;
+       case IOCTL_BCM_GPIO_SET_REQUEST:
+               Status = bcm_char_ioctl_gpio_set_request(argp, Adapter);
+               return Status;
+
+       case BCM_LED_THREAD_STATE_CHANGE_REQ:
+               Status = bcm_char_ioctl_led_thread_state_change_req(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GPIO_STATUS_REQUEST:
+               Status = bcm_char_ioctl_gpio_status_request(argp, Adapter);
+               return Status;
 
-               stTimeElapsedSinceNetEntry.ul64TimeElapsedSinceNetEntry = get_seconds() - Adapter->liTimeSinceLastNetEntry;
+       case IOCTL_BCM_GPIO_MULTI_REQUEST:
+               Status = bcm_char_ioctl_gpio_multi_request(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GPIO_MODE_REQUEST:
+               Status = bcm_char_ioctl_gpio_mode_request(argp, Adapter);
+               return Status;
+
+       case IOCTL_MAC_ADDR_REQ:
+       case IOCTL_LINK_REQ:
+       case IOCTL_CM_REQUEST:
+       case IOCTL_SS_INFO_REQ:
+       case IOCTL_SEND_CONTROL_MESSAGE:
+       case IOCTL_IDLE_REQ:
+               Status = bcm_char_ioctl_misc_request(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_BUFFER_DOWNLOAD_START:
+               Status = bcm_char_ioctl_buffer_download_start(Adapter);
+               return Status;
+
+       case IOCTL_BCM_BUFFER_DOWNLOAD:
+               Status = bcm_char_ioctl_buffer_download(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_BUFFER_DOWNLOAD_STOP:
+               Status = bcm_char_ioctl_buffer_download_stop(argp, Adapter);
+               return Status;
 
-               if (copy_to_user(IoBuffer.OutputBuffer, &stTimeElapsedSinceNetEntry, sizeof(struct bcm_time_elapsed)))
+
+       case IOCTL_BE_BUCKET_SIZE:
+               Status = 0;
+               if (get_user(Adapter->BEBucketSize, (unsigned long __user *)arg))
+                       Status = -EFAULT;
+               break;
+
+       case IOCTL_RTPS_BUCKET_SIZE:
+               Status = 0;
+               if (get_user(Adapter->rtPSBucketSize, (unsigned long __user *)arg))
+                       Status = -EFAULT;
+               break;
+
+       case IOCTL_CHIP_RESET:
+               Status = bcm_char_ioctl_chip_reset(Adapter);
+               return Status;
+
+       case IOCTL_QOS_THRESHOLD:
+               Status = bcm_char_ioctl_qos_threshold(arg, Adapter);
+               return Status;
+
+       case IOCTL_DUMP_PACKET_INFO:
+               DumpPackInfo(Adapter);
+               DumpPhsRules(&Adapter->stBCMPhsContext);
+               Status = STATUS_SUCCESS;
+               break;
+
+       case IOCTL_GET_PACK_INFO:
+               if (copy_to_user(argp, &Adapter->PackInfo, sizeof(struct bcm_packet_info)*NO_OF_QUEUES))
                        return -EFAULT;
-       }
-       break;
+               Status = STATUS_SUCCESS;
+               break;
+
+       case IOCTL_BCM_SWITCH_TRANSFER_MODE:
+               Status = bcm_char_ioctl_switch_transfer_mode(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GET_DRIVER_VERSION:
+               Status = bcm_char_ioctl_get_driver_version(argp);
+               return Status;
+
+       case IOCTL_BCM_GET_CURRENT_STATUS:
+               Status = bcm_char_ioctl_get_current_status(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_SET_MAC_TRACING:
+               Status = bcm_char_ioctl_set_mac_tracing(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GET_DSX_INDICATION:
+               Status = bcm_char_ioctl_get_dsx_indication(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GET_HOST_MIBS:
+               Status = bcm_char_ioctl_get_host_mibs(argp, Adapter, pTarang);
+               return Status;
+
+       case IOCTL_BCM_WAKE_UP_DEVICE_FROM_IDLE:
+               if ((false == Adapter->bTriedToWakeUpFromlowPowerMode) && (TRUE == Adapter->IdleMode)) {
+                       Adapter->usIdleModePattern = ABORT_IDLE_MODE;
+                       Adapter->bWakeUpDevice = TRUE;
+                       wake_up(&Adapter->process_rx_cntrlpkt);
+               }
+
+               Status = STATUS_SUCCESS;
+               break;
+
+       case IOCTL_BCM_BULK_WRM:
+               Status = bcm_char_ioctl_bulk_wrm(argp, Adapter, cmd);
+               return Status;
+
+       case IOCTL_BCM_GET_NVM_SIZE:
+               Status = bcm_char_ioctl_get_nvm_size(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_CAL_INIT:
+               Status = bcm_char_ioctl_cal_init(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_SET_DEBUG:
+               Status = bcm_char_ioctl_set_debug(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_NVM_READ:
+       case IOCTL_BCM_NVM_WRITE:
+               Status = bcm_char_ioctl_nvm_rw(argp, Adapter, cmd);
+               return Status;
+
+       case IOCTL_BCM_FLASH2X_SECTION_READ:
+               Status = bcm_char_ioctl_flash2x_section_read(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_FLASH2X_SECTION_WRITE:
+               Status = bcm_char_ioctl_flash2x_section_write(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP:
+               Status = bcm_char_ioctl_flash2x_section_bitmap(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_SET_ACTIVE_SECTION:
+               Status = bcm_char_ioctl_set_active_section(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_IDENTIFY_ACTIVE_SECTION:
+               /* Right Now we are taking care of only DSD */
+               Adapter->bAllDSDWriteAllow = false;
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
+               Status = STATUS_SUCCESS;
+               break;
+
+       case IOCTL_BCM_COPY_SECTION:
+               Status = bcm_char_ioctl_copy_section(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_GET_FLASH_CS_INFO:
+               Status = bcm_char_ioctl_get_flash_cs_info(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_SELECT_DSD:
+               Status = bcm_char_ioctl_select_dsd(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_NVM_RAW_READ:
+               Status = bcm_char_ioctl_nvm_raw_read(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_CNTRLMSG_MASK:
+               Status = bcm_char_ioctl_cntrlmsg_mask(argp, Adapter, pTarang);
+               return Status;
+
+       case IOCTL_BCM_GET_DEVICE_DRIVER_INFO:
+               Status = bcm_char_ioctl_get_device_driver_info(argp, Adapter);
+               return Status;
+
+       case IOCTL_BCM_TIME_SINCE_NET_ENTRY:
+               Status = bcm_char_ioctl_time_since_net_entry(argp, Adapter);
+               return Status;
 
        case IOCTL_CLOSE_NOTIFICATION:
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_CLOSE_NOTIFICATION");