SOURCES: kernel-desktop-sk98lin.patch - up to newest in kernel.spe...

czarny czarny at pld-linux.org
Fri Aug 3 02:25:59 CEST 2007


Author: czarny                       Date: Fri Aug  3 00:25:59 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to newest in kernel.spec at LINUX_2_6
- doesn't apply cleanly yet ;/

---- Files affected:
SOURCES:
   kernel-desktop-sk98lin.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-sk98lin.patch
diff -u SOURCES/kernel-desktop-sk98lin.patch:1.2 SOURCES/kernel-desktop-sk98lin.patch:1.3
--- SOURCES/kernel-desktop-sk98lin.patch:1.2	Sun Nov 19 07:01:15 2006
+++ SOURCES/kernel-desktop-sk98lin.patch	Fri Aug  3 02:25:53 2007
@@ -1,7 +1,7 @@
 diff -ruN linux/drivers/net/sk98lin/Makefile linux-new/drivers/net/sk98lin/Makefile
---- linux/drivers/net/sk98lin/Makefile	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/Makefile	2006-09-20 18:58:01.423265750 +0200
-@@ -1,6 +1,59 @@
+--- linux/drivers/net/sk98lin/Makefile	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/Makefile	2007-01-02 23:31:52.000000000 +0100
+@@ -1,6 +1,68 @@
 +#******************************************************************************
  #
 -# Makefile for the SysKonnect SK-98xx device driver.
@@ -40,8 +40,18 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.2  2006/11/19 06:01:15  sparky
-+#	- linux-2.6-sk98lin-8.36.1.3.patch
++#	Revision 1.3  2007/08/03 00:25:53  czarny
++#	- up to newest in kernel.spec at LINUX_2_6
++#	- doesn't apply cleanly yet ;/
++#	
++#	Revision 1.1.4.2  2006/08/28 12:44:39  mlindner
++#	Add: install.sh script handling added
++#	
++#	Revision 1.1.4.1  2006/08/28 09:01:59  mlindner
++#	Add: Initial IPMI kernel 2.4 and 2.6 support
++#	
++#	Revision 1.1  2006/07/19 15:37:22  amock
++#	Imported/updated from Release Server GELIN_V8_35_02
 +#	
 +#	Revision 1.9.2.1  2005/04/11 09:01:18  mlindner
 +#	Fix: Copyright year changed
@@ -65,7 +75,25 @@
  
  
  #
-@@ -13,20 +66,24 @@
+@@ -9,25 +71,43 @@
+ # SKPARAM += -DSK_KERNEL_24_26
+ # SKPARAM += -DSK_KERNEL_26
+ # SKPARAM += -DSK_KERNEL_22_24
++# ASFPARAM += -DSK_ASF
++
++ifdef ASFPARAM
++	ASF_OPS += \
++		skgeasf.o	\
++		skgeasfconv.o	\
++		skgespi.o	\
++		skgespilole.o	\
++		skfops.o
++else
++	ASF_OPS +=
++endif
++
++
+ 
  obj-$(CONFIG_SK98LIN) += sk98lin.o
  sk98lin-objs    :=	\
  		skge.o		\
@@ -79,27 +107,29 @@
  		skgepnmi.o	\
  		skgesirq.o	\
 -		ski2c.o		\
-+		sktwsi.o		\
++		sktwsi.o	\
  		sklm80.o	\
  		skqueue.o	\
  		skrlmt.o	\
  		sktimer.o	\
  		skvpd.o		\
 -		skxmac2.o
+-
 +		skxmac2.o	\
 +		skproc.o	\
-+		skcsum.o
- 
++		skcsum.o	\
++		$(ASF_OPS)
  # DBGDEF =  \
  # -DDEBUG
-@@ -75,13 +132,11 @@
+ 
+@@ -75,13 +155,11 @@
  # SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources
  # SK_DBGCAT_DRV_EVENT           0x08000000      driver events
  
 -EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
 +EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_USE_CSUM -DSK_DIAG_SUPPORT \
 +		-DGENESIS -DYUKON -DYUK2 -DCONFIG_SK98LIN_ZEROCOPY \
-+		$(DBGDEF) $(SKPARAM)
++		$(DBGDEF) $(SKPARAM) $(ASFPARAM)
  
  clean:
  	rm -f core *.o *.a *.s
@@ -110,8 +140,8 @@
 -
 -
 diff -ruN linux/drivers/net/sk98lin/h/lm80.h linux-new/drivers/net/sk98lin/h/lm80.h
---- linux/drivers/net/sk98lin/h/lm80.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/lm80.h	2006-07-28 14:13:54.000000000 +0200
+--- linux/drivers/net/sk98lin/h/lm80.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/lm80.h	2006-10-13 11:18:49.000000000 +0200
 @@ -2,8 +2,8 @@
   *
   * Name:	lm80.h	
@@ -140,8 +170,8 @@
   ******************************************************************************/
  
 diff -ruN linux/drivers/net/sk98lin/h/skaddr.h linux-new/drivers/net/sk98lin/h/skaddr.h
---- linux/drivers/net/sk98lin/h/skaddr.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/skaddr.h	2006-07-28 14:13:54.000000000 +0200
+--- linux/drivers/net/sk98lin/h/skaddr.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skaddr.h	2006-10-13 11:18:49.000000000 +0200
 @@ -2,14 +2,15 @@
   *
   * Name:	skaddr.h
@@ -249,8 +279,8 @@
  extern	int	SkAddrSwap(
  	SK_AC	*pAC,
 diff -ruN linux/drivers/net/sk98lin/h/skcsum.h linux-new/drivers/net/sk98lin/h/skcsum.h
---- linux/drivers/net/sk98lin/h/skcsum.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/skcsum.h	2006-07-28 14:13:54.000000000 +0200
+--- linux/drivers/net/sk98lin/h/skcsum.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skcsum.h	2006-10-13 11:18:49.000000000 +0200
 @@ -2,14 +2,15 @@
   *
   * Name:	skcsum.h
@@ -301,8 +331,8 @@
  	SK_AC		*pAc,
  	unsigned	ReceiveFlags,
 diff -ruN linux/drivers/net/sk98lin/h/skdebug.h linux-new/drivers/net/sk98lin/h/skdebug.h
---- linux/drivers/net/sk98lin/h/skdebug.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/skdebug.h	2006-07-28 14:13:54.000000000 +0200
+--- linux/drivers/net/sk98lin/h/skdebug.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skdebug.h	2006-10-13 11:18:49.000000000 +0200
 @@ -2,23 +2,24 @@
   *
   * Name:	skdebug.h
@@ -360,8 +390,8 @@
  /* Debug events */
  
 diff -ruN linux/drivers/net/sk98lin/h/skdrv1st.h linux-new/drivers/net/sk98lin/h/skdrv1st.h
---- linux/drivers/net/sk98lin/h/skdrv1st.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/skdrv1st.h	2006-07-28 14:13:56.000000000 +0200
+--- linux/drivers/net/sk98lin/h/skdrv1st.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skdrv1st.h	2006-10-13 11:18:50.000000000 +0200
 @@ -2,8 +2,8 @@
   *
   * Name:	skdrv1st.h
@@ -479,8 +509,8 @@
 + *
 + ******************************************************************************/
 diff -ruN linux/drivers/net/sk98lin/h/skdrv2nd.h linux-new/drivers/net/sk98lin/h/skdrv2nd.h
---- linux/drivers/net/sk98lin/h/skdrv2nd.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/skdrv2nd.h	2006-07-28 14:13:56.000000000 +0200
+--- linux/drivers/net/sk98lin/h/skdrv2nd.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skdrv2nd.h	2006-10-13 11:18:50.000000000 +0200
 @@ -1,17 +1,17 @@
  /******************************************************************************
   *
@@ -518,7 +548,7 @@
  #include "h/skgeinit.h"
  #include "h/skaddr.h"
  #include "h/skgesirq.h"
-@@ -53,103 +54,191 @@
+@@ -53,103 +54,194 @@
  #include "h/skrlmt.h"
  #include "h/skgedrv.h"
  
@@ -570,6 +600,9 @@
 +//#define USE_TX_COMPLETE	/* use of a transmit complete interrupt */
 +#define Y2_RX_CHECK		/* RX Check timestamp */
 +
++#define SK_REL_SPIN_LOCK(IoC)
++#define SK_ACQ_SPIN_LOCK(IoC)
++
 +/*
 + * use those defines for a compile-in version of the driver instead
 + * of command line parameters
@@ -779,13 +812,13 @@
  #define SK_DRIVER_RESET(pAC, IoC)	0
  #define SK_DRIVER_SENDEVENT(pAC, IoC)	0
  #define SK_DRIVER_SELFTEST(pAC, IoC)	0
-@@ -158,20 +247,16 @@
+@@ -158,20 +250,16 @@
  #define SK_DRIVER_SET_MTU(pAc,IoC,i,v)	0
  #define SK_DRIVER_PRESET_MTU(pAc,IoC,i,v)	0
  
 -/*
 -** Interim definition of SK_DRV_TIMER placed in this file until 
--** common modules have boon finallized
+-** common modules have been finalized
 -*/
 -#define SK_DRV_TIMER			11 
 -#define	SK_DRV_MODERATION_TIMER		1
@@ -809,7 +842,7 @@
  #define C_LEN_ETHERMAC_HEADER_DEST_ADDR 6
  #define C_LEN_ETHERMAC_HEADER_SRC_ADDR  6
  #define C_LEN_ETHERMAC_HEADER_LENTYPE   2
-@@ -197,112 +282,445 @@
+@@ -197,112 +285,448 @@
  #define C_PROTO_ID_UDP                  17       /* refer to RFC 790 or Stevens'   */
  #define C_PROTO_ID_TCP                  6        /* TCP/IP illustrated for details */
  
@@ -922,9 +955,8 @@
 + 	char          *pVirt;
 +  	SK_U64         pPhys;
 + 	unsigned int   FragLen;
- };
- 
--/* Used interrupt bits in the interrupts source register *********************/
++};
++
 +typedef	struct s_packet SK_PACKET;
 +struct s_packet {
 +	/* Common infos: */
@@ -944,8 +976,9 @@
 + 	SK_PACKET       *pHead;
 + 	SK_PACKET       *pTail;
 +	spinlock_t       QueueLock;     /* serialize packet accesses          */
-+};
-+
+ };
+ 
+-/* Used interrupt bits in the interrupts source register *********************/
 +/*******************************************************************************
 + *
 + * Macros specific for Yukon-II queues
@@ -1166,15 +1199,15 @@
 -			(IS_XS1_C)     |(IS_XA1_C)    | \
 -			(IS_XS2_C)     |(IS_XA2_C))
 +#endif
- 
--#define IRQ_HWE_MASK	(IS_ERR_MSK) /* enable all HW irqs */
++
 +
 +/*******************************************************************************
 + *
 + * Used interrupt bits in the interrupts source register
 + *
 + ******************************************************************************/
-+
+ 
+-#define IRQ_HWE_MASK	(IS_ERR_MSK) /* enable all HW irqs */
 +#define DRIVER_IRQS	((IS_IRQ_SW) | \
 +			 (IS_R1_F)   | (IS_R2_F)  | \
 +			 (IS_XS1_F)  | (IS_XA1_F) | \
@@ -1237,6 +1270,7 @@
 +	int		PortNr;
 +	int		NetNr;
 +	char		InitialDevName[20];
++	char		CurrentName[20];
 +	SK_BOOL		NetConsoleMode;
 +#ifdef Y2_RECOVERY
 +	struct 		timer_list KernelTimer;	/* Kernel timer struct  */
@@ -1252,6 +1286,8 @@
 +#endif
 +#endif
 +	SK_AC		*pAC;
++	struct 		timer_list ProcfsTimer;	/* Procfs timer struct  */
++
  };  
  
 -typedef struct s_TxPort		TX_PORT;
@@ -1339,7 +1375,7 @@
  
  #define IRQ_EOF_AS_TX     ((IS_XA1_F)     | (IS_XA2_F))
  #define IRQ_EOF_SY_TX     ((IS_XS1_F)     | (IS_XS2_F))
-@@ -314,134 +732,151 @@
+@@ -314,134 +738,157 @@
  #define IRQ_MASK_SP_TX    ((SPECIAL_IRQS)    | (IRQ_MASK_TX_ONLY))
  #define IRQ_MASK_RX_TX_SP ((SPECIAL_IRQS)    | (IRQ_MASK_TX_RX))
  
@@ -1533,6 +1569,10 @@
 +	SK_ADDR                  Addr;          /* for Address module         */
 +	SK_CSUM                  Csum;          /* for checksum module        */
 +	SK_RLMT                  Rlmt;          /* for rlmt module            */
++#ifdef SK_ASF
++	SK_ASF_DATA              AsfData;
++	unsigned char            IpAddr[4];
++#endif
 +	spinlock_t               SlowPathLock;  /* Normal IRQ lock            */
 +	spinlock_t               InitLock;	/* Init lock                  */
 +	spinlock_t               TxQueueLock;   /* TX Queue lock              */
@@ -1570,6 +1610,7 @@
 +	unsigned                 SizeOfAlignedLETables;	
 +	spinlock_t               SetPutIndexLock;
 +	int                      MaxUnusedRxLeWorking;
++        int                      InterfaceUp[2];
 +	unsigned int             CsOfs1;        /* for checksum calculation   */
 +	unsigned int             CsOfs2;        /* for checksum calculation   */
 +	SK_U32                   CsOfs;         /* for checksum calculation   */
@@ -1599,7 +1640,7 @@
  
  
 -#endif /* __INC_SKDRV2ND_H */
- 
++
 +#endif
 +
 +/*******************************************************************************
@@ -1607,9 +1648,10 @@
 + * End of file
 + *
 + ******************************************************************************/
+ 
 diff -ruN linux/drivers/net/sk98lin/h/skerror.h linux-new/drivers/net/sk98lin/h/skerror.h
---- linux/drivers/net/sk98lin/h/skerror.h	2006-09-20 05:42:06.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/h/skerror.h	2006-07-28 14:13:54.000000000 +0200
+--- linux/drivers/net/sk98lin/h/skerror.h	2007-01-02 23:21:17.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skerror.h	2006-10-13 11:18:49.000000000 +0200
 @@ -2,23 +2,24 @@
   *
   * Name:	skerror.h
@@ -1627,7 +1669,7 @@
 + *	LICENSE:
   *	(C)Copyright 1998-2002 SysKonnect.
 - *	(C)Copyright 2002-2003 Marvell.
-+ *	(C)Copyright 2002-2004 Marvell.
++ *	(C)Copyright 2002-2006 Marvell.
   *
   *	This program is free software; you can redistribute it and/or modify
   *	it under the terms of the GNU General Public License as published by
@@ -1639,28 +1681,751 @@
   *
   ******************************************************************************/
  
-@@ -36,7 +37,6 @@
- #define	SK_ERRCL_HW			(1L<<4)	/* Hardware Failure */
- #define	SK_ERRCL_COMM		(1L<<5)	/* Communication error */
+@@ -28,28 +29,30 @@
+ /*
+  * Define Error Classes
+  */
+-#define	SK_ERRCL_OTHER		(0)		/* Other error */
+-#define	SK_ERRCL_CONFIG		(1L<<0)	/* Configuration error */
+-#define	SK_ERRCL_INIT		(1L<<1)	/* Initialization error */
+-#define	SK_ERRCL_NORES		(1L<<2)	/* Out of Resources error */
+-#define	SK_ERRCL_SW			(1L<<3)	/* Internal Software error */
+-#define	SK_ERRCL_HW			(1L<<4)	/* Hardware Failure */
+-#define	SK_ERRCL_COMM		(1L<<5)	/* Communication error */
+-
++#define SK_ERRCL_OTHER		(0)		/* Other error */
++#define SK_ERRCL_CONFIG		(1L<<0)	/* Configuration error */
++#define SK_ERRCL_INIT		(1L<<1)	/* Initialization error */
++#define SK_ERRCL_NORES		(1L<<2)	/* Out of Resources error */
++#define SK_ERRCL_SW			(1L<<3)	/* Internal Software error */
++#define SK_ERRCL_HW			(1L<<4)	/* Hardware Failure */
++#define SK_ERRCL_COMM		(1L<<5)	/* Communication error */
++#define SK_ERRCL_INFO		(1L<<6)	/* Information */
  
--
  /*
   * Define Error Code Bases
   */
-@@ -49,7 +49,9 @@
- #define	SK_ERRBASE_I2C		 700	/* Base Error number for I2C module */
- #define	SK_ERRBASE_QUEUE	 800	/* Base Error number for Scheduler */
- #define	SK_ERRBASE_ADDR		 900	/* Base Error number for Address module */
+-#define	SK_ERRBASE_RLMT		 100	/* Base Error number for RLMT */
+-#define	SK_ERRBASE_HWINIT	 200	/* Base Error number for HWInit */
+-#define	SK_ERRBASE_VPD		 300	/* Base Error number for VPD */
+-#define	SK_ERRBASE_PNMI		 400	/* Base Error number for PNMI */
+-#define	SK_ERRBASE_CSUM		 500	/* Base Error number for Checksum */
+-#define	SK_ERRBASE_SIRQ		 600	/* Base Error number for Special IRQ */
+-#define	SK_ERRBASE_I2C		 700	/* Base Error number for I2C module */
+-#define	SK_ERRBASE_QUEUE	 800	/* Base Error number for Scheduler */
+-#define	SK_ERRBASE_ADDR		 900	/* Base Error number for Address module */
 -#define SK_ERRBASE_PECP		1000    /* Base Error number for PECP */
+-#define	SK_ERRBASE_DRV		1100	/* Base Error number for Driver */
++#define SK_ERRBASE_RLMT		 100	/* Base Error number for RLMT */
++#define SK_ERRBASE_HWINIT	 200	/* Base Error number for HWInit */
++#define SK_ERRBASE_VPD		 300	/* Base Error number for VPD */
++#define SK_ERRBASE_PNMI		 400	/* Base Error number for PNMI */
++#define SK_ERRBASE_CSUM		 500	/* Base Error number for Checksum */
++#define SK_ERRBASE_SIRQ		 600	/* Base Error number for Special IRQ */
++#define SK_ERRBASE_I2C		 700	/* Base Error number for I2C module */
++#define SK_ERRBASE_QUEUE	 800	/* Base Error number for Scheduler */
++#define SK_ERRBASE_ADDR		 900	/* Base Error number for Address module */
 +#define SK_ERRBASE_PECP		1000	/* Base Error number for PECP */
- #define	SK_ERRBASE_DRV		1100	/* Base Error number for Driver */
++#define SK_ERRBASE_DRV		1100	/* Base Error number for Driver */
 +#define SK_ERRBASE_ASF		1200	/* Base Error number for ASF */
  
  #endif	/* _INC_SKERROR_H_ */
 +
+diff -ruN linux/drivers/net/sk98lin/h/skfops.h linux-new/drivers/net/sk98lin/h/skfops.h
+--- linux/drivers/net/sk98lin/h/skfops.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skfops.h	2006-10-13 11:18:49.000000000 +0200
+@@ -0,0 +1,39 @@
++
++/******************************************************************************
++ *
++ * Name:    skfops.c
++ * Project: Gigabit Ethernet Adapters, Common Modules
++ * Version: $Revision$
++ * Date:    $Date$
++ * Purpose: Kernel mode file read functions.
++ *
++ ******************************************************************************/
++
++/******************************************************************************
++ *
++ *	(C)Copyright 1998-2002 SysKonnect
++ *	(C)Copyright 2002-2003 Marvell
++ *
++ *	THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF SYSKONNECT
++ *	The copyright notice above does not evidence any
++ *	actual or intended publication of such source code.
++ *
++ *	This Module contains Proprietary Information of SysKonnect
++ *	and should be treated as Confidential.
++ *
++ *	The information in this file is provided for the exclusive use of
++ *	the licensees of SysKonnect.
++ *	Such users have the right to use, modify, and incorporate this code
++ *	into products for purposes authorized by the license agreement
++ *	provided they include this notice and the associated copyright notice
++ *	with any such product.
++ *	The information in this file is provided "AS IS" without warranty.
++ *
++ ******************************************************************************/
++
++
++SK_BOOL fw_read(	SK_AC *pAC,    /* Pointer to adapter context */
++	char *name, SK_U8 **addr, SK_U32 *len );
++SK_BOOL fw_file_exists(	SK_AC *pAC,    /* Pointer to adapter context */
++	char *name );
++
+diff -ruN linux/drivers/net/sk98lin/h/skgeasf.h linux-new/drivers/net/sk98lin/h/skgeasf.h
+--- linux/drivers/net/sk98lin/h/skgeasf.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-new/drivers/net/sk98lin/h/skgeasf.h	2006-10-13 10:18:34.000000000 +0200
+@@ -0,0 +1,547 @@
++/******************************************************************************
++ *
++ * Name:    skgeasf.h
++ * Project: asf/ipmi
++ * Version: $Revision$
++ * Date:    $Date$
++ * Purpose: asf/ipmi interface in windows driver
++ *
++ ******************************************************************************/
++
++/******************************************************************************
++ *
++ *  (C)Copyright 1998-2002 SysKonnect.
++ *  (C)Copyright 2002-2003 Marvell.
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  The information in this file is provided "AS IS" without warranty.
++ *
++ ******************************************************************************/
++
++#ifndef _INC_SKGEASF_H_
++#define _INC_SKGEASF_H_
++
++#ifdef __cplusplus
++extern "C" {
++#endif  /* __cplusplus */
++
++/* DEFINES */
++#define ASF_FW_ARP_RESOLVE                  //  FW is resolving the destination IP addr
++#define ASF_FW_WD                           //  Driver is watching the FW
++#define ASF_CHECK_HIDDEN_ID                 //  ASF init checks hidden id
++
++// modes for the asf driver
++#define SK_GEASF_MODE_UNKNOWN               0       // unknown operation mode (initial)
++#define SK_GEASF_MODE_ASF                   1       // asfec.bin binary found -> ASF operation
++#define SK_GEASF_MODE_IPMI                  2       // ipmiy2.bin binary found -> IPMI operation
++
++// chip modes for asf driver
++#define SK_GEASF_CHIP_UNKNOWN               0       // bad chip id / hidden id
++#define SK_GEASF_CHIP_EC                    1       // EC: ASF
++#define SK_GEASF_CHIP_Y2                    2       // Yukon2
++
++// dual link mode
++#define SK_GEASF_Y2_SINGLEPORT              1       // Yukon2 sigle link adapter
++#define SK_GEASF_Y2_DUALPORT                2       // Yukon2 dual link adapter
++
++#define ASF_GUI_TSF                         10      /* Time Scale Factor: 1s(GUI) <-> 10*100ms(FW) */
++
++#define ASF_MAX_STRLEN                      64
++
++// lengths used in get oid
++#define ASF_ACPI_MAXBUFFLENGTH              256     // max bytes for holding ACPI table
++#define ASF_SMBUS_MAXBUFFLENGTH             128     // max bytes for holding SMBus info
++#define ASF_FWVER_MAXBUFFLENGTH             40      // max stringlen for firmware version
++
++#define SK_ASF_EVT_TIMER_EXPIRED            1       /* Counter overflow */
++#define SK_ASF_EVT_TIMER_SPI_EXPIRED        2       /* Counter overflow */
++#define SK_ASF_EVT_TIMER_HCI_EXPIRED        3       /* Counter overflow */
++
++/*  Return codes to the PNMI module  */
++#define SK_ASF_PNMI_ERR_OK              0
++#define SK_ASF_PNMI_ERR_GENERAL         1
++#define SK_ASF_PNMI_ERR_TOO_SHORT       2
++#define SK_ASF_PNMI_ERR_BAD_VALUE       3
++#define SK_ASF_PNMI_ERR_READ_ONLY       4
++#define SK_ASF_PNMI_ERR_UNKNOWN_OID     5
++#define SK_ASF_PNMI_ERR_UNKNOWN_INST    6
++#define SK_ASF_PNMI_ERR_UNKNOWN_NET     7
++#define SK_ASF_PNMI_ERR_NOT_SUPPORTED   10
++
++#define REG_ASF_MAC_ADDR        0x0f24
++#define REG_ASF_MY_IP           0x0f50
++#define REG_ASF_STATUS_CMD      0x0e68
++#define REG_ASF_SMBUS_CFG       0x0e40
++
++#define ASF_CPU_STATE_UNKNOWN       0
++#define ASF_CPU_STATE_RESET         1
++#define ASF_CPU_STATE_RUNNING       2
++
++
++/*  ASF MIB default values */
++#define ASF_DEF_RETRANS_COUNT_MIN   0           // x1
++#define ASF_DEF_RETRANS_COUNT_MAX   255         // x1
++#define ASF_DEF_WATCHDOG_ENA        0           //
++#define ASF_DEF_WATCHDOG_TIME       1200        // *100ms
++#define ASF_DEF_WATCHDOG_TIME_MAX   36000       // *100ms
++#define ASF_DEF_WATCHDOG_TIME_MIN   600         // *100ms
++#define ASF_DEF_RETRANS_INT_MIN     0           // *100ms
++#define ASF_DEF_RETRANS_INT_MAX     2550        // *100ms
++#define ASF_DEF_HB_INT_MIN          10          // *100ms
++#define ASF_DEF_HB_INT_MAX          2550        // *100ms
++#define ASF_DEF_ASF_ENA             0
++#define ASF_DEF_RETRANS             2
++#define ASF_DEF_RETRANS_INT         10          // *100ms
++#define ASF_DEF_HB_ENA              0
++#define ASF_DEF_HB_INT              600         // *100ms
++
++/* ASF HCI Commands */
++#define YASF_HOSTCMD_ASF_INFO                   1
++#define YASF_HOSTCMD_LEG_CONF                   2
++#define YASF_HOSTCMD_ASF_CONF                   3
++#define YASF_HOSTCMD_RCTRL_CONF                 4
++#define YASF_HOSTCMD_KEEP_ALIVE                 5
++#define YASF_HOSTCMD_NEW_SEPROM_CONFIG          6
++#define YASF_HOSTCMD_ENTER_RAM_IDLE             7
++#define YASF_HOSTCMD_LEAVE_RAM_IDLE             8
++#define YASF_HOSTCMD_RUN_DIAG                   9
++#define YASF_HOSTCMD_RESET_STATE                10
++#define YASF_HOSTCMD_RESET                      11
++#define YASF_HOSTCMD_CHECK_ALIVE                12
++#define YASF_HOSTCMD_DRV_HELLO                  13
++#define YASF_HOSTCMD_DRV_GOODBYE                14
++#define YASF_HOSTCMD_DRV_STANDBY                15
++#define YASF_HOSTCMD_UPDATE_OWN_MACADDR         16
++#define YASF_HOSTCMD_ARP_RESOLVE                17
++#define YASF_HOSTCMD_RESET_COLD                 18
++#define YASF_HOSTCMD_ACPI_RMCP_DATA             19
++#define YASF_HOSTCMD_ACPI_ERROR                 20
++
++#define YASF_HOSTCMD_CFG_SET_ASF_ENABLE         100
++#define YASF_HOSTCMD_CFG_SET_RSP_ENABLE         101
++#define YASF_HOSTCMD_CFG_SET_RETRANS            102
++#define YASF_HOSTCMD_CFG_SET_RETRANS_INT        103
++#define YASF_HOSTCMD_CFG_SET_HB_ENABLE          104
++#define YASF_HOSTCMD_CFG_SET_HB_INT             105
++#define YASF_HOSTCMD_CFG_SET_IP_DESTINATION     106
++#define YASF_HOSTCMD_CFG_SET_IP_SOURCE          107
++#define YASF_HOSTCMD_CFG_SET_MAC_DESTINATION    108
++#define YASF_HOSTCMD_CFG_SET_COMMUNITY_NAME     109
++#define YASF_HOSTCMD_CFG_SET_RSP_KEY_1          110
++#define YASF_HOSTCMD_CFG_SET_RSP_KEY_2          111
++#define YASF_HOSTCMD_CFG_SET_RSP_KEY_3          112
++#define YASF_HOSTCMD_CFG_SET_DRWD_ENABLE        113
++#define YASF_HOSTCMD_CFG_SET_DRWD_INT           114
++#define YASF_HOSTCMD_CFG_SET_WD_ENABLE          115
++#define YASF_HOSTCMD_CFG_SET_WD_INT             116
++#define YASF_HOSTCMD_CFG_SET_ASF_RAMSIZE        117
++#define YASF_HOSTCMD_CFG_SET_ACTIVE_PORT        118
++
++#define YASF_HOSTCMD_CFG_STORE_CONFIG           130
++
++#define YASF_HOSTCMD_CFG_GET_ASF_ENABLE         150
++#define YASF_HOSTCMD_CFG_GET_RSP_ENABLE         151
++#define YASF_HOSTCMD_CFG_GET_RETRANS            152
++#define YASF_HOSTCMD_CFG_GET_RETRANS_INT        153
++#define YASF_HOSTCMD_CFG_GET_HB_ENABLE          154
++#define YASF_HOSTCMD_CFG_GET_HB_INT             155
++#define YASF_HOSTCMD_CFG_GET_IP_DESTINATION     156
++#define YASF_HOSTCMD_CFG_GET_IP_SOURCE          157
++#define YASF_HOSTCMD_CFG_GET_MAC_DESTINATION    158
++#define YASF_HOSTCMD_CFG_GET_COMMUNITY_NAME     159
++#define YASF_HOSTCMD_CFG_GET_RSP_KEY_1          160
++#define YASF_HOSTCMD_CFG_GET_RSP_KEY_2          161
++#define YASF_HOSTCMD_CFG_GET_RSP_KEY_3          162
++#define YASF_HOSTCMD_CFG_GET_DRWD_ENABLE        163
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-sk98lin.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list