On Wed, Jun 8, 2011 at 12:26 PM, Chang, Samuel <[email protected]> wrote: > Hi Auke, > > I don't think to disable ALL message is correct. > > If we do so, we won't know the real error is happening. > Theses error message won't show in normal case but only error happends. > > These patches's purpose are to disable UNNECESSARY logs not to disable ALL > message.. > > If you think to disable all message including critical error is correct. > I am fine but I will say I can't debug it immediately.
That's not my point (and not what I'm saying at all). The problem is that your patch is OK, but it doesn't solve the problem that ALL debug messages end up on the console (even when booting with loglevel=0). The root cause is that the macro mess in this driver ends up printk'ing messages without any loglevel. And those are always printed. You need to fix the macro's that print, not just the level at which they print. See below for my 'quick disable debugging' patch: your fix should be ending up in the same code here. My patch just disables debug logging altogether, you probably should fix this to properly honor the loglevel settings. A really good way to fix this is to stop using your own versions of dev_err() and start using the kernel driver printk standards already in place. Auke From: Auke Kok <[email protected]> 2 atheros staging drivers pretend to use printk() but fail and therefore spew debugging output no matter what loglevel=N you set at boot. This eliminates the messages alltogether and ensures we're not needlessly calling printk() internals for debug type messages. Signed-off-by: Auke Kok <[email protected]> --- Index: linux-2.6.37/drivers/staging/ar6003/os/linux/include/debug_linux.h =================================================================== --- linux-2.6.37.orig/drivers/staging/ar6003/os/linux/include/debug_linux.h +++ linux-2.6.37/drivers/staging/ar6003/os/linux/include/debug_linux.h @@ -26,17 +26,11 @@ #ifdef DEBUG /* NOTE: the AR_DEBUG_PRINTF macro is defined here to handle special handling of variable arg macros * which may be compiler dependent. */ -#define AR_DEBUG_PRINTF(mask, args) do { \ - if (GET_ATH_MODULE_DEBUG_VAR_MASK(ATH_MODULE_NAME) & (mask)) { \ - A_LOGGER(mask, ATH_MODULE_NAME, ATH_PRINTX_ARG args); \ - } \ -} while (0) +#define AR_DEBUG_PRINTF(mask, args) do {} while (0) #else /* on non-debug builds, keep in error and warning messages in the driver, all other * message tracing will get compiled out */ -#define AR_DEBUG_PRINTF(mask, args) \ - if ((mask) & (ATH_DEBUG_ERR | ATH_DEBUG_WARN)) { A_PRINTF(ATH_PRINTX_ARG args); } - +#define AR_DEBUG_PRINTF(mask, args) do {} while (0) #endif /* compile specific macro to get the function name string */ Index: linux-2.6.37/drivers/staging/ath6kl/os/linux/include/debug_linux.h =================================================================== --- linux-2.6.37.orig/drivers/staging/ath6kl/os/linux/include/debug_linux.h +++ linux-2.6.37/drivers/staging/ath6kl/os/linux/include/debug_linux.h @@ -30,17 +30,11 @@ #ifdef DEBUG /* NOTE: the AR_DEBUG_PRINTF macro is defined here to handle special handling of variable arg macros * which may be compiler dependent. */ -#define AR_DEBUG_PRINTF(mask, args) do { \ - if (GET_ATH_MODULE_DEBUG_VAR_MASK(ATH_MODULE_NAME) & (mask)) { \ - A_LOGGER(mask, ATH_MODULE_NAME, ATH_PRINTX_ARG args); \ - } \ -} while (0) +#define AR_DEBUG_PRINTF(mask, args) do {} while (0) #else /* on non-debug builds, keep in error and warning messages in the driver, all other * message tracing will get compiled out */ -#define AR_DEBUG_PRINTF(mask, args) \ - if ((mask) & (ATH_DEBUG_ERR | ATH_DEBUG_WARN)) { A_PRINTF(ATH_PRINTX_ARG args); } - +#define AR_DEBUG_PRINTF(mask, args) do {} while (0) #endif /* compile specific macro to get the function name string */ > > > -----Original Message----- > From: Kok, Auke-jan H [mailto:[email protected]] > Sent: Thursday, June 09, 2011 3:16 AM > To: Chang, Samuel > Cc: [email protected]; [email protected]; Wu, Ricky; Huang, > Maggie; Yang, Jack > Subject: Re: [Meego-kernel] [PATCH] ar6003 : reduce unnecessary log during > driver loading > > This completely doesn't solve the issue. > > The underlying macro salad that attempts to translate these messages is > completely broken, and so, the messages are getting back on the console no > matter what LOGLEVEL you use. > > fixing the loglevel for every message will not fix it, please fix the macro > salad instead. > > Auke > > > On Thu, Jun 2, 2011 at 3:06 PM, Chang, Samuel <[email protected]> > wrote: >> Subject: Unnecessary log during driver loading, set the debug level to >> INFO >> >> Signed-off-by: Samuel Chang <[email protected]> >> >> diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/hif/sdio/linux_sdio/src/hi >> f.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/hif/sdio/l >> inux_sdio/src/hif.c >> --- >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/hif/sdio/linux_sdio/src/hi >> f.c 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/hif/sd >> +++ io/linux_sdio/src/hif.c 2011-06-03 05:38:24.931220050 +0800 >> @@ -812,7 +812,7 @@ >> >> break; >> case HIF_DEVICE_GET_PENDING_EVENTS_FUNC: >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6000: configuration opcode %d is not >> used for Linux SDIO stack", opcode)); >> status = A_ERROR; >> break; >> @@ -820,7 +820,7 @@ >> *((HIF_DEVICE_IRQ_PROCESSING_MODE *)config) = >> HIF_DEVICE_IRQ_SYNC_ONLY; >> break; >> case HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC: >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6000: configuration opcode %d is not >> used for Linux SDIO stack", opcode)); >> status = A_ERROR; >> break; >> @@ -841,12 +841,12 @@ >> status = PowerStateChangeNotify(device, >> *(HIF_DEVICE_POWER_CHANGE_TYPE *)config); >> break; >> case HIF_DEVICE_GET_IRQ_YIELD_PARAMS: >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6000: configuration opcode %d is only >> used for RTOS systems, not Linux systems", opcode)); >> status = A_ERROR; >> break; >> default: >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6000: Unsupported configuration >> opcode: %d\n", opcode)); >> status = A_ERROR; >> } >> diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/AR6000/ar6k.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/AR600 >> 0/ar6k.c >> --- kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/AR6000/ar6k.c >> 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/A >> +++ R6000/ar6k.c 2011-06-03 05:38:55.331370799 +0800 >> @@ -158,7 +158,7 @@ >> >> switch (pDev->HifIRQProcessingMode) { >> case HIF_DEVICE_IRQ_SYNC_ONLY: >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN,("HIF Interrupt >> processing is SYNC ONLY\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("HIF Interrupt >> + processing is SYNC ONLY\n")); >> /* see if HIF layer wants HTC to yield */ >> HIFConfigureDevice(pDev->HIFDevice, >> HIF_DEVICE_GET_IRQ_YIELD_PARAMS, @@ >> -815,7 +815,7 @@ >> sizeof(pDev->HifScatterInfo)); >> >> if (A_FAILED(status)) { >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6K: ** HIF layer does not support scatter requests >> (%d) \n",status)); >> >> /* we can try to use a virtual DMA scatter mechanism using >> legacy HIFReadWrite() */ @@ -828,7 +828,7 @@ >> } >> >> } else { >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6K: HIF layer supports scatter requests (max scatter >> items:%d: maxlen:%d) \n", >> DEV_GET_MAX_MSG_PER_BUNDLE(pDev), >> DEV_GET_MAX_BUNDLE_LENGTH(pDev))); >> } >> @@ -852,7 +852,7 @@ >> pDev->MaxSendBundleSize = >> pDev->HifScatterInfo.MaxTransferSizePerScatterReq; >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR6K: max recv: %d max send: %d \n", >> DEV_GET_MAX_BUNDLE_RECV_LENGTH(pDev), >> DEV_GET_MAX_BUNDLE_SEND_LENGTH(pDev))); >> >> diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/AR6000/ar6k_gmbox.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/AR600 >> 0/ar6k_gmbox.c >> --- >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/AR6000/ar6k_gmbox.c >> 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/A >> +++ R6000/ar6k_gmbox.c 2011-06-03 05:39:02.823407947 +0800 >> @@ -277,7 +277,7 @@ >> break; >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY,(" GMBOX Advertised: >> Address:0x%X , size:%d \n", >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,(" GMBOX Advertised: >> + Address:0x%X , size:%d \n", >> pDev->MailBoxInfo.GMboxAddress, >> pDev->MailBoxInfo.GMboxSize)); >> >> status = DevGMboxIRQAction(pDev, GMBOX_DISABLE_ALL, >> PROC_IO_SYNC); diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/AR6000/ar6k_gmbox_hci >> uart.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/AR600 >> 0/ar6k_gmbox_hciuart.c >> --- >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/AR6000/ar6k_gmbox_hci >> uart.c 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/A >> +++ R6000/ar6k_gmbox_hciuart.c 2011-06-03 05:39:19.519490737 >> +++ +0800 >> @@ -174,7 +174,7 @@ >> >> if (A_SUCCESS(status)) { >> pProt->CreditsAvailable = pProt->CreditsMax; >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY,("HCI : InitTxCreditState - >> credits avail: %d, size: %d \n", >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("HCI : InitTxCreditState - >> + credits avail: %d, size: %d \n", >> pProt->CreditsAvailable, pProt->CreditSize)); >> } >> >> @@ -918,7 +918,7 @@ >> props.TailRoom = 0; >> props.IOBlockPad = pProt->pDev->BlockSize; >> if (pProt->HCIAttached) { >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY,("HCI: notifying attached >> client to transport... \n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("HCI: notifying attached >> + client to transport... \n")); >> A_ASSERT(pProt->HCIConfig.TransportReady != NULL); >> status = pProt->HCIConfig.TransportReady(pProt, >> &props, @@ -1272,9 >> +1272,9 @@ >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to enable/disable HCI >> power management!\n")); >> } else { >> if (Enable) { >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HCI power management >> ENABLED!\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("HCI power management >> + ENABLED!\n")); >> } else { >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HCI power management >> DISABLED!\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("HCI power management >> + DISABLED!\n")); >> } >> } >> >> diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/htc.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/htc.c >> --- kernel-2.6.37.6-11.5/drivers/staging/ar6003/htc2/htc.c >> 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/htc2/h >> +++ tc.c 2011-06-03 05:39:35.643570692 +0800 >> @@ -272,7 +272,7 @@ >> target->TargetCredits = pRdyMsg->Version2_0_Info.CreditCount; >> target->TargetCreditSize = >> pRdyMsg->Version2_0_Info.CreditSize; >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, (" Target Ready: credits: %d >> credit size: %d\n", >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, (" Target Ready: credits: %d >> + credit size: %d\n", >> target->TargetCredits, target->TargetCreditSize)); >> >> /* check if this is an extended ready message */ diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/miscdrv/ar3kconfig.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/miscdrv/ar >> 3kconfig.c >> --- kernel-2.6.37.6-11.5/drivers/staging/ar6003/miscdrv/ar3kconfig.c >> 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/miscdr >> +++ v/ar3kconfig.c 2011-06-03 05:41:26.548120637 +0800 >> @@ -238,7 +238,7 @@ >> break; >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR3K Config: Baud Changed to %d >> \n",pConfig->AR3KBaudRate)); >> } >> >> @@ -257,7 +257,7 @@ >> break; >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO, >> ("AR3K Config: Baud changed to %d for AR6K\n", >> pConfig->AR3KBaudRate)); >> } >> >> @@ -362,7 +362,7 @@ >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Patch Download >> Failed!\n")); >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ANY,("TLPM - PwrMgmtEnabled=%d, >> IdleTimeout=%d, WakeupTimeout=%d\n", >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("TLPM - PwrMgmtEnabled=%d, >> + IdleTimeout=%d, WakeupTimeout=%d\n", >> pConfig->PwrMgmtEnabled, >> pConfig->IdleTimeout, >> pConfig->WakeupTimeout)); diff >> -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/miscdrv/ar3kps/ar3kpsconfi >> g.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/miscdrv/ar >> 3kps/ar3kpsconfig.c >> --- >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/miscdrv/ar3kps/ar3kpsconfi >> g.c 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/miscdr >> +++ v/ar3kps/ar3kpsconfig.c 2011-06-03 05:41:13.408055479 +0800 >> @@ -205,7 +205,7 @@ >> } >> >> snprintf(config_path, MAX_FW_PATH_LEN, "%s%s",path,PsFileName); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%x: FPGA/ASIC PS File Name %s\n", >> DevType,config_path)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("%x: FPGA/ASIC PS File Name >> + %s\n", DevType,config_path)); >> /* Read the PS file to a dynamically allocated buffer */ >> if(A_REQUEST_FIRMWARE(&firmware,config_path,firmwareDev) < 0) { >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open >> error\n", __FUNCTION__ )); @@ -238,7 +238,7 @@ >> else { >> status = 0; >> } >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Patch File Name %s\n", >> config_path)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Patch File Name %s\n", >> + config_path)); >> if((patchFileName == NULL) || >> (A_REQUEST_FIRMWARE(&firmware,config_path,firmwareDev) < 0)) { >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open >> error\n", __FUNCTION__ )); >> /* >> @@ -416,7 +416,7 @@ >> { >> /* Read Contents of BDADDR file if user has not >> provided any option */ >> snprintf(config_path,MAX_FW_PATH_LEN, >> "%s%s",path,BDADDR_FILE); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Patch File Name %s\n", >> config_path)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Patch File Name %s\n", >> + config_path)); >> if(A_REQUEST_FIRMWARE(&firmware,config_path,firmwareDev) < 0) { >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open >> error\n", __FUNCTION__ )); >> status = 1; >> @@ -486,7 +486,7 @@ >> #endif /* HCI_TRANSPORT_SDIO */ >> >> A_STATUS ReadPSEvent(A_UCHAR* Data){ >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" PS Event %x %x >> %x\n",Data[4],Data[5],Data[3])); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,(" PS Event %x %x >> + %x\n",Data[4],Data[5],Data[3])); >> >> if(Data[4] == 0xFC && Data[5] == 0x00) >> { >> diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/miscdrv/ar3kps/ar3kpsparse >> r.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/miscdrv/ar >> 3kps/ar3kpsparser.c >> --- >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/miscdrv/ar3kps/ar3kpsparse >> r.c 2011-05-27 06:16:59.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/miscdr >> +++ v/ar3kps/ar3kpsparser.c 2011-06-03 05:41:00.963993772 +0800 >> @@ -418,7 +418,7 @@ >> } >> //pCharLine +=5; >> PsTagEntry[TagCount].TagId = >> uReadDataInSection(pCharLine, stPS_DataFormat); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" TAG ID %d >> \n",PsTagEntry[TagCount].TagId)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,(" TAG ID %d >> + \n",PsTagEntry[TagCount].TagId)); >> >> //AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("tag # %x\n", >> PsTagEntry[TagCount].TagId); >> if (TagCount == 0) @@ -450,7 +450,7 @@ >> } >> PsTagEntry[TagCount].TagLen = ByteCount; >> PsTagEntry[TagCount].TagData = >> (A_UINT8*)A_MALLOC(ByteCount); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" TAG Length %d >> Tag Index %d \n",PsTagEntry[TagCount].TagLen,TagCount)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,(" TAG Length %d >> + Tag Index %d \n",PsTagEntry[TagCount].TagLen,TagCount)); >> stReadStatus.uSection = 3; >> stReadStatus.uLineCount = 0; >> } >> @@ -544,7 +544,7 @@ >> LineRead++; >> } >> Tag_Count = TagCount; >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Number of Tags %d\n", >> Tag_Count)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Number of Tags %d\n", >> + Tag_Count)); >> } >> >> >> @@ -639,7 +639,7 @@ >> } >> count = 0; >> while(ByteCount_Org > MAX_BYTE_LENGTH){ >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" Index [%d]\n",j)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,(" Index [%d]\n",j)); >> for (i = 0,k=0; i < MAX_BYTE_LENGTH*2; i += 2,k++,count +=2) { >> if(GetNextTwoChar(patchbuffer,patchlen,&filepos,Byte) == >> A_ERROR) { >> return A_ERROR; >> @@ -655,7 +655,7 @@ >> if(j == 0){ >> j++; >> } >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" Index [%d]\n",j)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,(" Index [%d]\n",j)); >> for (k=0; k < ByteCount_Org; i += 2,k++,count+=2) { >> if(GetNextTwoChar(patchbuffer,patchlen,&filepos,Byte) == >> A_ERROR) { >> return A_ERROR; >> @@ -686,7 +686,7 @@ >> >> if(NULL != srcbuffer && srclen != 0) >> { >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("File Open Operation >> Successful\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("File Open Operation >> + Successful\n")); >> >> status = >> AthParseFilesUnified(srcbuffer,srclen,MB_FILEFORMAT_PATCH); >> } >> @@ -701,7 +701,7 @@ >> for(i=0; i<Tag_Count; i++){ >> if(PsTagEntry[i].TagId == 1){ >> BDADDR_Present = A_OK; >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BD >> ADDR is present in Patch File \r\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BD >> + ADDR is present in Patch File \r\n")); >> >> } >> if(PsTagEntry[i].TagLen % 2 == 1){ @@ -715,11 >> +715,11 @@ >> } >> >> if(Tag_Count > 0 && !BDADDR_Present){ >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BD ADDR is not >> present adding 10 extra bytes \r\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BD ADDR is not >> + present adding 10 extra bytes \r\n")); >> Total_tag_lenght=Total_tag_lenght + 10; >> } >> Total_tag_lenght = Total_tag_lenght+ 10 + (Tag_Count*4); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("** Total Length >> %d\n",Total_tag_lenght)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("** Total Length >> + %d\n",Total_tag_lenght)); >> >> >> return status; >> @@ -789,46 +789,46 @@ >> Crc |= RAM_PATCH_REGION; >> if(Tag_Count > 0) >> Crc |= RAM_PS_REGION; >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("PS Thread Started CRC %x Patch >> Count %d Tag Count %d \n",Crc,Patch_Count,Tag_Count)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("PS Thread Started CRC %x Patch >> + Count %d Tag Count %d \n",Crc,Patch_Count,Tag_Count)); >> >> if(Patch_Count || Tag_Count ){ >> NumcmdEntry+=(2 + Patch_Count + Tag_Count); /* CRC Packet + PS >> Reset Packet + Patch List + PS List*/ >> if(Patch_Count > 0) { >> NumcmdEntry++; /* Patch Enable Command */ >> } >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Num Cmd Entries %d Size >> %d \r\n",NumcmdEntry,(A_UINT32)sizeof(PSCmdPacket) * NumcmdEntry)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Num Cmd Entries %d Size >> + %d \r\n",NumcmdEntry,(A_UINT32)sizeof(PSCmdPacket) * NumcmdEntry)); >> (*HciPacketList) = A_MALLOC(sizeof(PSCmdPacket) * >> NumcmdEntry); >> if(NULL == *HciPacketList) { >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("memory allocation >> failed \r\n")); >> } >> >> AthPSCreateHCICommand(PS_VERIFY_CRC,Crc,*HciPacketList,numPackets); >> if(Patch_Count > 0){ >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("*** Write Patch**** >> \r\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("*** Write Patch**** >> + \r\n")); >> >> AthPSCreateHCICommand(WRITE_PATCH,Patch_Count,*HciPacketList,numPacket >> s); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("*** Enable Patch**** >> \r\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("*** Enable Patch**** >> + \r\n")); >> >> AthPSCreateHCICommand(ENABLE_PATCH,0,*HciPacketList,numPackets); >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("*** PS Reset**** %d[0x%x] >> \r\n",PS_RAM_SIZE,PS_RAM_SIZE)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("*** PS Reset**** %d[0x%x] >> + \r\n",PS_RAM_SIZE,PS_RAM_SIZE)); >> >> AthPSCreateHCICommand(PS_RESET,PS_RAM_SIZE,*HciPacketList,numPackets); >> if(Tag_Count > 0){ >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("*** PS Write**** \r\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("*** PS Write**** >> + \r\n")); >> >> AthPSCreateHCICommand(PS_WRITE,Tag_Count,*HciPacketList,numPackets); >> } >> } >> if(!BDADDR){ >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BD ADDR not present \r\n")); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BD ADDR not present \r\n")); >> >> } >> for(count = 0; count < Patch_Count; count++) { >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Freeing Patch Buffer %d >> \r\n",count)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Freeing Patch Buffer %d >> + \r\n",count)); >> A_FREE(RamPatch[Patch_Count].Data); >> } >> >> for(count = 0; count < Tag_Count; count++) { >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Freeing PS Buffer %d >> \r\n",count)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Freeing PS Buffer %d >> + \r\n",count)); >> A_FREE(PsTagEntry[count].TagData); >> } >> >> @@ -858,7 +858,7 @@ >> for(i=0;i< Param1;i++){ >> >> HCI_PS_Command = (A_UCHAR *) >> A_MALLOC(RamPatch[i].Len+HCI_COMMAND_HEADER); >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Allocated Buffer Size >> %d\n",RamPatch[i].Len+HCI_COMMAND_HEADER)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("Allocated Buffer Size >> + %d\n",RamPatch[i].Len+HCI_COMMAND_HEADER)); >> if(HCI_PS_Command == NULL){ >> AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("MALLOC >> Failed\r\n")); >> return A_ERROR; @@ -945,7 +945,7 @@ >> case PS_VERIFY_CRC: >> Length = 0x0; >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("VALUE of >> CRC:%d At index %d\r\n",Param1,*index)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("VALUE of >> + CRC:%d At index %d\r\n",Param1,*index)); >> >> HCI_PS_Command = (A_UCHAR *) >> A_MALLOC(Length+HCI_COMMAND_HEADER); >> if(HCI_PS_Command == NULL){ diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/os/linux/ar6000_drv.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/os/linux/a >> r6000_drv.c >> --- kernel-2.6.37.6-11.5/drivers/staging/ar6003/os/linux/ar6000_drv.c >> 2011-05-27 06:17:00.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/os/lin >> +++ ux/ar6000_drv.c 2011-06-03 05:43:23.576700939 +0800 >> @@ -1689,8 +1689,8 @@ >> param |= (mac_addr_method << HI_OPTION_MAC_ADDR_METHOD_SHIFT); >> param |= (firmware_bridge << HI_OPTION_FW_BRIDGE_SHIFT); >> >> - A_PRINTF("NUM_DEV=%d FWMODE=0x%x FWBR_BUF %d\n", num_device, >> fwmode, >> - firmware_bridge); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("NUM_DEV=%d FWMODE=0x%x >> + FWBR_BUF %d\n", num_device, fwmode, >> + firmware_bridge)); >> >> if (BMIWriteMemory(ar->arHifDevice, >> HOST_INTEREST_ITEM_ADDRESS(ar->arTargetType, >> hi_option_flag), @@ -2046,7 +2046,7 @@ >> goto avail_ev_failed; >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s() Got WMI @ 0x%08x.\n", >> __func__, >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("%s() Got WMI @ >> + 0x%08x.\n", __func__, >> (unsigned int) arPriv->arWmi)); >> } >> } >> @@ -2109,7 +2109,7 @@ >> ar->arVersion.target_ver = targ_info.target_ver; >> ar->arTargetType = targ_info.target_type; >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s() TARGET TYPE: %d\n", >> __func__,ar->arTargetType)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("%s() TARGET TYPE: %d\n", >> + __func__,ar->arTargetType)); >> target_register_tbl_attach(ar->arTargetType); >> >> /* do any target-specific preparation that can be done >> through BMI */ @@ -3110,7 +3110,7 @@ >> goto ar6000_init_done; >> } >> >> - AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s() WMI is ready\n", >> __func__)); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("%s() WMI is ready\n", >> + __func__)); >> >> /* init PAL driver after WMI is ready */ >> if(setuphcipal) >> @@ -5613,7 +5613,7 @@ >> void >> ar6000_regDomain_event(AR_SOFTC_DEV_T *arPriv, A_UINT32 regCode) >> { >> - A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR6000 Reg Code = 0x%x\n", >> + regCode)); >> arPriv->arRegCode = regCode; >> } >> >> diff -ruN >> kernel-2.6.37.6-11.5/drivers/staging/ar6003/reorder/rcv_aggr.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/reorder/rc >> v_aggr.c >> --- kernel-2.6.37.6-11.5/drivers/staging/ar6003/reorder/rcv_aggr.c >> 2011-05-27 06:17:00.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/reorde >> +++ r/rcv_aggr.c 2011-06-03 05:47:47.810011220 +0800 >> @@ -62,7 +62,7 @@ >> p_aggr->rx_fn = fn; >> p_aggr->netbuf_allocator = netbuf_allocator; >> p_aggr->netbuf_allocator(&p_aggr->freeQ, >> AGGR_NUM_OF_FREE_NETBUFS); >> - A_PRINTF("aggr_init....status OK\n"); >> + AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("aggr_init....status OK\n")); >> return A_OK; >> } >> >> diff -ruN kernel-2.6.37.6-11.5/drivers/staging/ar6003/wmi/wmi.c >> kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/wmi/wmi.c >> --- kernel-2.6.37.6-11.5/drivers/staging/ar6003/wmi/wmi.c >> 2011-05-27 06:17:00.000000000 +0800 >> +++ kernel-2.6.37.6-11.5_mod_log_reduced/drivers/staging/ar6003/wmi/wm >> +++ i.c 2011-06-03 05:48:14.714144622 +0800 >> @@ -1003,7 +1003,7 @@ >> break; >> #endif /* CONFIG_TARGET_PROFILE_SUPPORT */ >> default: >> - A_DPRINTF(DBG_WMI|DBG_ERROR, >> + A_DPRINTF(DBG_WMI, >> (DBGFMT "Unknown id 0x%x\n", DBGARG, id)); >> wmip->wmi_stats.cmd_id_err++; >> status = A_ERROR; >> @@ -1383,7 +1383,7 @@ >> break; >> >> default: >> - A_DPRINTF(DBG_WMI|DBG_ERROR, >> + A_DPRINTF(DBG_WMI, >> (DBGFMT "Unknown id 0x%x\n", DBGARG, id)); >> wmip->wmi_stats.cmd_id_err++; >> status = A_ERROR; >> _______________________________________________ >> MeeGo-kernel mailing list >> [email protected] >> http://lists.meego.com/listinfo/meego-kernel >> >> > _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
