Skip to content

L
linux
Commit f5dc2265 authored by Mirko Lindner's avatar Mirko Lindner Committed by Stephen Hemminger
Browse files
Options

[netdrvr sk98lin] fix leaks on error, and related cleanups

parent 3f2a0156
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 59 deletions
drivers/net/sk98lin/h/skversion.h
View file @ f5dc2265
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* *
* Name: version.h * Name: version.h
* Project: GEnesis, PCI Gigabit Ethernet Adapter * Project: GEnesis, PCI Gigabit Ethernet Adapter
* Version: $Revision: 1.2 $ * Version: $Revision: 1.3 $
* Date: $Date: 2003/08/13 12:01:01 $ * Date: $Date: 2003/08/25 13:34:48 $
* Purpose: SK specific Error log support * Purpose: SK specific Error log support
* *
******************************************************************************/ ******************************************************************************/
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
* *
* History: * History:
* $Log: skversion.h,v $ * $Log: skversion.h,v $
* Revision 1.3 2003/08/25 13:34:48 mlindner
* Fix: Lint changes
*
* Revision 1.2 2003/08/13 12:01:01 mlindner * Revision 1.2 2003/08/13 12:01:01 mlindner
* Add: Changes for Lint * Add: Changes for Lint
* *
...@@ -51,12 +54,12 @@ ...@@ -51,12 +54,12 @@
#ifdef lint #ifdef lint
static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH."; static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
static const char SysKonnectBuildNumber[] = static const char SysKonnectBuildNumber[] =
"@(#)SK-BUILD: 6.17 PL: 01"; "@(#)SK-BUILD: 6.18 PL: 01";
#endif /* !defined(lint) */ #endif /* !defined(lint) */
#define BOOT_STRING "sk98lin: Network Device Driver v6.17\n" \ #define BOOT_STRING "sk98lin: Network Device Driver v6.18\n" \
"(C)Copyright 1999-2003 Marvell(R)." "(C)Copyright 1999-2003 Marvell(R)."
#define VER_STRING "6.17" #define VER_STRING "6.18"
drivers/net/sk98lin/skge.c
View file @ f5dc2265
...@@ -56,6 +56,18 @@ ...@@ -56,6 +56,18 @@
* History: * History:
* *
* $Log: skge.c,v $ * $Log: skge.c,v $
* Revision 1.16 2003/09/23 11:07:35 mlindner
* Fix: IO-control return race condition
* Fix: Interrupt moderation value check
*
* Revision 1.15 2003/09/22 08:40:05 mlindner
* Add: Added DRIVER_FILE_NAME and DRIVER_REL_DATE
*
* Revision 1.14 2003/09/22 08:11:10 mlindner
* Add: New function for PCI initialization (SkGeInitPCI)
* Add: Yukon Plus changes (ChipID, PCI...)
* Fix: TCP and UDP Checksum calculation
*
* Revision 1.11 2003/08/26 16:05:19 mlindner * Revision 1.11 2003/08/26 16:05:19 mlindner
* Fix: Compiler warnings (void *) * Fix: Compiler warnings (void *)
* *
...@@ -394,6 +406,7 @@ ...@@ -394,6 +406,7 @@
* <linux/module.h> * <linux/module.h>
* *
* "h/skdrv1st.h" * "h/skdrv1st.h"
* <linux/version.h>
* <linux/types.h> * <linux/types.h>
* <linux/kernel.h> * <linux/kernel.h>
* <linux/string.h> * <linux/string.h>
...@@ -550,6 +563,7 @@ static void ClearTxRing(SK_AC*, TX_PORT*); ...@@ -550,6 +563,7 @@ static void ClearTxRing(SK_AC*, TX_PORT*);
static int SkGeChangeMtu(struct SK_NET_DEVICE *dev, int new_mtu); static int SkGeChangeMtu(struct SK_NET_DEVICE *dev, int new_mtu);
static void PortReInitBmu(SK_AC*, int); static void PortReInitBmu(SK_AC*, int);
static int SkGeIocMib(DEV_NET*, unsigned int, int); static int SkGeIocMib(DEV_NET*, unsigned int, int);
static int SkGeInitPCI(SK_AC *pAC);
static void StartDrvCleanupTimer(SK_AC *pAC); static void StartDrvCleanupTimer(SK_AC *pAC);
static void StopDrvCleanupTimer(SK_AC *pAC); static void StopDrvCleanupTimer(SK_AC *pAC);
static int XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*); static int XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*);
...@@ -619,10 +633,10 @@ static int __init skge_probe (void) ...@@ -619,10 +633,10 @@ static int __init skge_probe (void)
SK_AC *pAC; SK_AC *pAC;
DEV_NET *pNet = NULL; DEV_NET *pNet = NULL;
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
unsigned long base_address;
struct SK_NET_DEVICE *dev = NULL; struct SK_NET_DEVICE *dev = NULL;
SK_BOOL DeviceFound = SK_FALSE; SK_BOOL DeviceFound = SK_FALSE;
SK_BOOL BootStringCount = SK_FALSE; SK_BOOL BootStringCount = SK_FALSE;
int retval;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
int proc_root_initialized = 0; int proc_root_initialized = 0;
struct proc_dir_entry *pProcFile; struct proc_dir_entry *pProcFile;
...@@ -667,6 +681,8 @@ static int __init skge_probe (void) ...@@ -667,6 +681,8 @@ static int __init skge_probe (void)
pNet = dev->priv; pNet = dev->priv;
pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL); pNet->pAC = kmalloc(sizeof(SK_AC), GFP_KERNEL);
if (pNet->pAC == NULL){ if (pNet->pAC == NULL){
dev->get_stats = NULL;
unregister_netdev(dev);
kfree(dev->priv); kfree(dev->priv);
printk(KERN_ERR "Unable to allocate adapter " printk(KERN_ERR "Unable to allocate adapter "
"structure!\n"); "structure!\n");
...@@ -693,6 +709,14 @@ static int __init skge_probe (void) ...@@ -693,6 +709,14 @@ static int __init skge_probe (void)
pNet->Mtu = 1500; pNet->Mtu = 1500;
pNet->Up = 0; pNet->Up = 0;
dev->irq = pdev->irq; dev->irq = pdev->irq;
retval = SkGeInitPCI(pAC);
if (retval) {
printk("SKGE: PCI setup failed: %i\n", retval);
dev->get_stats = NULL;
unregister_netdev(dev);
kfree(dev);
continue;
}
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
dev->open = &SkGeOpen; dev->open = &SkGeOpen;
...@@ -716,41 +740,6 @@ static int __init skge_probe (void) ...@@ -716,41 +740,6 @@ static int __init skge_probe (void)
#endif #endif
#endif #endif
/*
* Dummy value.
*/
dev->base_addr = 42;
pci_set_master(pdev);
pci_set_master(pdev);
base_address = pci_resource_start (pdev, 0);
#ifdef SK_BIG_ENDIAN
/*
* On big endian machines, we use the adapter's aibility of
* reading the descriptors as big endian.
*/
{
SK_U32 our2;
SkPciReadCfgDWord(pAC, PCI_OUR_REG_2, &our2);
our2 |= PCI_REV_DESC;
SkPciWriteCfgDWord(pAC, PCI_OUR_REG_2, our2);
}
#endif
/*
* Remap the regs into kernel space.
*/
pAC->IoBase = (char*)ioremap(base_address, 0x4000);
if (!pAC->IoBase){
printk(KERN_ERR "%s: Unable to map I/O register, "
"SK 98xx No. %i will be disabled.\n",
dev->name, boards_found);
kfree(dev);
break;
}
pAC->Index = boards_found; pAC->Index = boards_found;
if (SkGeBoardInit(dev, pAC)) { if (SkGeBoardInit(dev, pAC)) {
FreeResources(dev); FreeResources(dev);
...@@ -887,6 +876,68 @@ static int __init skge_probe (void) ...@@ -887,6 +876,68 @@ static int __init skge_probe (void)
} /* skge_probe */ } /* skge_probe */
/*****************************************************************************
*
* SkGeInitPCI - Init the PCI resources
*
* Description:
* This function initialize the PCI resources and IO
*
* Returns: N/A
*
*/
int SkGeInitPCI(SK_AC *pAC)
{
struct SK_NET_DEVICE *dev = pAC->dev[0];
struct pci_dev *pdev = pAC->PciDev;
int retval;
if (pci_enable_device(pdev) != 0) {
return 1;
}
dev->mem_start = pci_resource_start (pdev, 0);
pci_set_master(pdev);
if (pci_request_regions(pdev, pAC->Name) != 0) {
retval = 2;
goto out_disable;
}
#ifdef SK_BIG_ENDIAN
/*
* On big endian machines, we use the adapter's aibility of
* reading the descriptors as big endian.
*/
{
SK_U32 our2;
SkPciReadCfgDWord(pAC, PCI_OUR_REG_2, &our2);
our2 |= PCI_REV_DESC;
SkPciWriteCfgDWord(pAC, PCI_OUR_REG_2, our2);
}
#endif
/*
* Remap the regs into kernel space.
*/
pAC->IoBase = (char*)ioremap_nocache(dev->mem_start, 0x4000);
if (!pAC->IoBase){
retval = 3;
goto out_release;
}
return 0;
out_release:
pci_release_regions(pdev);
out_disable:
pci_disable_device(pdev);
return retval;
}
/***************************************************************************** /*****************************************************************************
* *
* FreeResources - release resources allocated for adapter * FreeResources - release resources allocated for adapter
...@@ -908,6 +959,9 @@ SK_AC *pAC; ...@@ -908,6 +959,9 @@ SK_AC *pAC;
pNet = (DEV_NET*) dev->priv; pNet = (DEV_NET*) dev->priv;
pAC = pNet->pAC; pAC = pNet->pAC;
AllocFlag = pAC->AllocFlag; AllocFlag = pAC->AllocFlag;
if (pAC->PciDev) {
pci_release_regions(pAC->PciDev);
}
if (AllocFlag & SK_ALLOC_IRQ) { if (AllocFlag & SK_ALLOC_IRQ) {
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
} }
...@@ -2172,7 +2226,7 @@ struct sk_buff *pMessage) /* pointer to send-message */ ...@@ -2172,7 +2226,7 @@ struct sk_buff *pMessage) /* pointer to send-message */
*/ */
if (BytesSend < C_LEN_ETHERNET_MINSIZE) { if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
skb_put(pMessage, (C_LEN_ETHERNET_MINSIZE-BytesSend)); skb_put(pMessage, (C_LEN_ETHERNET_MINSIZE-BytesSend));
memset( ((int *)(pMessage->data))+BytesSend, SK_MEMSET( ((char *)(pMessage->data))+BytesSend,
0, C_LEN_ETHERNET_MINSIZE-BytesSend); 0, C_LEN_ETHERNET_MINSIZE-BytesSend);
} }
...@@ -2205,10 +2259,12 @@ struct sk_buff *pMessage) /* pointer to send-message */ ...@@ -2205,10 +2259,12 @@ struct sk_buff *pMessage) /* pointer to send-message */
if (pMessage->ip_summed == CHECKSUM_HW) { if (pMessage->ip_summed == CHECKSUM_HW) {
Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff); Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff);
if ((Protocol == C_PROTO_ID_UDP) && (pAC->GIni.GIChipRev != 0)) { if ((Protocol == C_PROTO_ID_UDP) &&
pTxd->TBControl = BMU_UDP_CHECK; (pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
pTxd->TBControl = BMU_TCP_CHECK;
} else { } else {
pTxd->TBControl = BMU_TCP_CHECK ; pTxd->TBControl = BMU_UDP_CHECK;
} }
IpHeaderLength = (SK_U8)pMessage->data[C_OFFSET_IPHEADER]; IpHeaderLength = (SK_U8)pMessage->data[C_OFFSET_IPHEADER];
...@@ -2333,10 +2389,12 @@ struct sk_buff *pMessage) /* pointer to send-message */ ...@@ -2333,10 +2389,12 @@ struct sk_buff *pMessage) /* pointer to send-message */
** (Revision 2.0) ** (Revision 2.0)
*/ */
Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff); Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff);
if ((Protocol == C_PROTO_ID_UDP) && (pAC->GIni.GIChipRev != 0)) { if ((Protocol == C_PROTO_ID_UDP) &&
pTxd->TBControl |= BMU_UDP_CHECK; (pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
pTxd->TBControl |= BMU_TCP_CHECK;
} else { } else {
pTxd->TBControl |= BMU_TCP_CHECK ; pTxd->TBControl |= BMU_UDP_CHECK;
} }
IpHeaderLength = ((SK_U8)pMessage->data[C_OFFSET_IPHEADER] & 0xf)*4; IpHeaderLength = ((SK_U8)pMessage->data[C_OFFSET_IPHEADER] & 0xf)*4;
...@@ -2383,11 +2441,12 @@ struct sk_buff *pMessage) /* pointer to send-message */ ...@@ -2383,11 +2441,12 @@ struct sk_buff *pMessage) /* pointer to send-message */
** opcode for udp is not working in the hardware yet ** opcode for udp is not working in the hardware yet
** (revision 2.0) ** (revision 2.0)
*/ */
if ( (Protocol == C_PROTO_ID_UDP) && if ((Protocol == C_PROTO_ID_UDP) &&
(pAC->GIni.GIChipRev != 0) ) { (pAC->GIni.GIChipRev == 0) &&
pTxd->TBControl |= BMU_UDP_CHECK ; (pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
pTxd->TBControl |= BMU_TCP_CHECK;
} else { } else {
pTxd->TBControl |= BMU_TCP_CHECK ; pTxd->TBControl |= BMU_UDP_CHECK;
} }
} else { } else {
pTxd->TBControl = BMU_CHECK | BMU_SW | BMU_OWN; pTxd->TBControl = BMU_CHECK | BMU_SW | BMU_OWN;
...@@ -3616,21 +3675,26 @@ int HeaderLength = sizeof(SK_U32) + sizeof(SK_U32); ...@@ -3616,21 +3675,26 @@ int HeaderLength = sizeof(SK_U32) + sizeof(SK_U32);
Length = sizeof(pAC->PnmiStruct) + HeaderLength; Length = sizeof(pAC->PnmiStruct) + HeaderLength;
} }
if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) { if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) {
return -EFAULT; return -ENOMEM;
} }
if(copy_from_user(pMemBuf, Ioctl.pData, Length)) { if(copy_from_user(pMemBuf, Ioctl.pData, Length)) {
return -EFAULT; Err = -EFAULT;
goto fault_gen;
} }
if ((Ret = SkPnmiGenIoctl(pAC, pAC->IoBase, pMemBuf, &Length, 0)) < 0) { if ((Ret = SkPnmiGenIoctl(pAC, pAC->IoBase, pMemBuf, &Length, 0)) < 0) {
return -EFAULT; Err = -EFAULT;
goto fault_gen;
} }
if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) { if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) {
return -EFAULT; Err = -EFAULT;
goto fault_gen;
} }
Ioctl.Len = Length; Ioctl.Len = Length;
if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) { if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
return -EFAULT; Err = -EFAULT;
goto fault_gen;
} }
fault_gen:
kfree(pMemBuf); /* cleanup everything */ kfree(pMemBuf); /* cleanup everything */
break; break;
default: default:
...@@ -4370,7 +4434,7 @@ int Capabilities[3][3] = ...@@ -4370,7 +4434,7 @@ int Capabilities[3][3] =
} }
if (IntsPerSec[pAC->Index] != 0) { if (IntsPerSec[pAC->Index] != 0) {
if ((IntsPerSec[pAC->Index]< 30)&&(IntsPerSec[pAC->Index]> 40000)) { if ((IntsPerSec[pAC->Index]< 30) || (IntsPerSec[pAC->Index]> 40000)) {
pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT; pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
} else { } else {
pAC->DynIrqModInfo.MaxModIntsPerSec = IntsPerSec[pAC->Index]; pAC->DynIrqModInfo.MaxModIntsPerSec = IntsPerSec[pAC->Index];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7