diff options
Diffstat (limited to 'target/linux/rdc')
| -rw-r--r-- | target/linux/rdc/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/rdc/config-2.6.24 | 344 | ||||
| -rw-r--r-- | target/linux/rdc/files/arch/x86/kernel/cpu/rdc.c (renamed from target/linux/rdc/files/arch/i386/kernel/cpu/rdc.c) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/arch/x86/mach-rdc/Makefile (renamed from target/linux/rdc/files/arch/i386/mach-rdc/Makefile) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/arch/x86/mach-rdc/gpio.c (renamed from target/linux/rdc/files/arch/i386/mach-rdc/gpio.c) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/arch/x86/mach-rdc/platform.c (renamed from target/linux/rdc/files/arch/i386/mach-rdc/platform.c) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/arch/x86/mach-rdc/setup.c (renamed from target/linux/rdc/files/arch/i386/mach-rdc/setup.c) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/arch/x86/mach-rdc/wdt.c (renamed from target/linux/rdc/files/arch/i386/mach-rdc/wdt.c) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/drivers/net/r6040.c | 1646 | ||||
| -rw-r--r-- | target/linux/rdc/files/include/asm-x86/gpio.h (renamed from target/linux/rdc/files/include/asm-i386/gpio.h) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/include/asm-x86/mach-generic/gpio.h (renamed from target/linux/rdc/files/include/asm-i386/mach-generic/gpio.h) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/include/asm-x86/mach-rdc/gpio.h (renamed from target/linux/rdc/files/include/asm-i386/mach-rdc/gpio.h) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/files/include/asm-x86/mach-rdc/rdc321x_defs.h (renamed from target/linux/rdc/files/include/asm-i386/mach-rdc/rdc321x_defs.h) | 0 | ||||
| -rw-r--r-- | target/linux/rdc/patches/001-x86_generic_gpio.patch | 6 | ||||
| -rw-r--r-- | target/linux/rdc/patches/004-rdc_fixes.patch | 116 | ||||
| -rw-r--r-- | target/linux/rdc/patches/005-rdc_x86_cpu_type.patch | 22 | ||||
| -rw-r--r-- | target/linux/rdc/patches/600-x86_lzma.patch | 86 |
17 files changed, 1299 insertions, 923 deletions
diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index 1b70c1876f..4e83e163d7 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -11,7 +11,7 @@ BOARD:=rdc BOARDNAME:=RDC321x x86 FEATURES:=squashfs jffs2 pci -LINUX_VERSION:=2.6.23.16 +LINUX_VERSION:=2.6.24.2 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/rdc/config-2.6.24 b/target/linux/rdc/config-2.6.24 new file mode 100644 index 0000000000..672374c9d5 --- /dev/null +++ b/target/linux/rdc/config-2.6.24 @@ -0,0 +1,344 @@ +# CONFIG_60XX_WDT is not set +# CONFIG_64BIT is not set +# CONFIG_8139TOO is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_AGP is not set +# CONFIG_ALIM1535_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_PIIX=m +# CONFIG_AUDIT_ARCH is not set +CONFIG_BASE_SMALL=0 +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +CONFIG_BITREVERSE=y +CONFIG_BLK_DEV_IDE=m +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_BLK_DEV_PLATFORM is not set +CONFIG_BOUNCE=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BT_HCIUART_LL is not set +CONFIG_CLOCKSOURCE_WATCHDOG=y +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CPU5_WDT is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set +CONFIG_CRYPTO_AES_586=m +# CONFIG_CRYPTO_HW is not set +CONFIG_CRYPTO_TWOFISH_586=m +# CONFIG_CS5535_GPIO is not set +# CONFIG_DCDBAS is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_DELL_RBU is not set +CONFIG_DEVPORT=y +# CONFIG_DMADEVICES is not set +CONFIG_DMI=y +CONFIG_DMIID=y +CONFIG_DOUBLEFAULT=y +# CONFIG_E100 is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_EDAC is not set +# CONFIG_EDD is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_FIXED_PHY is not set +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_FS_POSIX_ACL=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y +# CONFIG_GENERIC_CPU is not set +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_ISA_DMA=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +# CONFIG_GEN_RTC is not set +# CONFIG_HANGCHECK_TIMER is not set +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HIBERNATION_UP_POSSIBLE=y +CONFIG_HID=m +# CONFIG_HIDRAW is not set +CONFIG_HID_SUPPORT=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGH_RES_TIMERS is not set +# CONFIG_HPET_TIMER is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_AMD is not set +# CONFIG_HW_RANDOM_GEODE is not set +# CONFIG_HW_RANDOM_INTEL is not set +# CONFIG_HW_RANDOM_VIA is not set +CONFIG_HZ=250 +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +CONFIG_I2C_BOARDINFO=y +# CONFIG_I6300ESB_WDT is not set +# CONFIG_I8K is not set +# CONFIG_IB700_WDT is not set +# CONFIG_IBMASR is not set +# CONFIG_IBM_ASM is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +CONFIG_ICPLUS_PHY=y +CONFIG_IDE=m +# CONFIG_IDEPCI_PCIBUS_ORDER is not set +CONFIG_IDE_ARCH_OBSOLETE_INIT=y +# CONFIG_IDE_ARM is not set +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_PROC_FS is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_INPUT=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_YEALINK=m +CONFIG_INSTRUMENTATION=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_ISA is not set +CONFIG_ISA_DMA_API=y +# CONFIG_IT8712F_WDT is not set +# CONFIG_ITCO_WDT is not set +CONFIG_JFS_FS=m +CONFIG_KEXEC=y +CONFIG_KTIME_SCALAR=y +# CONFIG_KVM is not set +CONFIG_LBD=y +# CONFIG_LEDS_ALIX is not set +CONFIG_LEDS_GPIO=y +# CONFIG_LGUEST is not set +CONFIG_LSF=y +# CONFIG_M386 is not set +CONFIG_M486=y +# CONFIG_M586 is not set +# CONFIG_M586MMX is not set +# CONFIG_M586TSC is not set +# CONFIG_M686 is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_MACINTOSH_DRIVERS is not set +# CONFIG_MARKERS is not set +CONFIG_MATH_EMULATION=y +# CONFIG_MCA is not set +# CONFIG_MCORE2 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MICROCODE is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MPENTIUM4 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPSC is not set +CONFIG_MTD=y +# CONFIG_MTD_ABSENT is not set +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_CFI=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_CONCAT=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +CONFIG_MTD_MAP_BANK_WIDTH_2=y +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_NETSC520 is not set +# CONFIG_MTD_ONENAND is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_PLATRAM is not set +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_PNC2000 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_RDC3210=y +CONFIG_MTD_RDC3210_ALLOW_JFFS2=y +CONFIG_MTD_RDC3210_BUSWIDTH=2 +# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set +CONFIG_MTD_RDC3210_SIZE=0x400000 +# CONFIG_MTD_RDC3210_STATIC_MAP is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_SC520CDP is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_TS5500 is not set +# CONFIG_MTRR is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MWINCHIP2 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_NET_VENDOR_3COM is not set +CONFIG_NLS_ISO8859_2=m +CONFIG_NOHIGHMEM=y +# CONFIG_NO_HZ is not set +CONFIG_NR_QUICK=1 +# CONFIG_NSC_GPIO is not set +CONFIG_NVRAM=y +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PARAVIRT_GUEST is not set +CONFIG_PATA_ARTOP=m +# CONFIG_PATA_CS5536 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PC8736x_GPIO is not set +# CONFIG_PC87413_WDT is not set +CONFIG_PCCARD=m +CONFIG_PCCARD_NONSTATIC=m +# CONFIG_PCIEPORTBUS is not set +# CONFIG_PCIPCWATCHDOG is not set +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_GOANY=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOMMCONFIG is not set +CONFIG_PCMCIA=m +CONFIG_PHYLIB=y +CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_PHYSICAL_START=0x100000 +# CONFIG_QSEMI_PHY is not set +CONFIG_QUICKLIST=y +CONFIG_R6040=m +# CONFIG_R6040_NAPI is not set +# CONFIG_RELOCATABLE is not set +# CONFIG_RTC is not set +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_SBC7240_WDT is not set +# CONFIG_SBC8360_WDT is not set +# CONFIG_SBC_EPX_C3_WATCHDOG is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SC520_WDT is not set +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set +# CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_WAIT_SCAN=m +# CONFIG_SCx200 is not set +# CONFIG_SCx200_ACB is not set +CONFIG_SEMAPHORE_SLEEPERS=y +# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SLABINFO=y +# CONFIG_SMP is not set +# CONFIG_SMSC37B787_WDT is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_SND_CS5530 is not set +CONFIG_SOFT_WATCHDOG=m +# CONFIG_SONYPI is not set +# CONFIG_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_SSB_POSSIBLE=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_TELCLOCK is not set +# CONFIG_TICK_ONESHOT is not set +# CONFIG_TOSHIBA is not set +CONFIG_UID16=y +# CONFIG_USBPCWATCHDOG is not set +CONFIG_USB_EHCI_HCD=m +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_SERIAL_CH341 is not set +# CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USER_NS is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_VGASTATE is not set +# CONFIG_VIA_RHINE is not set +CONFIG_VIDEO_CAPTURE_DRIVERS=y +CONFIG_VIDEO_CPIA2=m +# CONFIG_VIDEO_TCM825X is not set +CONFIG_VIDEO_V4L1=y +# CONFIG_VIDEO_VP27SMPX is not set +CONFIG_VIRTUALIZATION=y +# CONFIG_VM86 is not set +# CONFIG_VMSPLIT_1G is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_WAFER_WDT is not set +CONFIG_X86=y +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86_ALIGNMENT_16=y +# CONFIG_X86_BIGSMP is not set +CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_BSWAP=y +CONFIG_X86_CMPXCHG=y +CONFIG_X86_CPUID=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_ES7000 is not set +CONFIG_X86_F00F_BUG=y +# CONFIG_X86_GENERIC is not set +# CONFIG_X86_GENERICARCH is not set +CONFIG_X86_INVLPG=y +CONFIG_X86_L1_CACHE_SHIFT=4 +# CONFIG_X86_MCE is not set +CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_MSR=y +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_PAE is not set +# CONFIG_X86_PC is not set +CONFIG_X86_POPAD_OK=y +CONFIG_X86_PPRO_FENCE=y +CONFIG_X86_RDC=y +CONFIG_X86_REBOOTFIXUPS=y +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_UP_APIC is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_VSMP is not set +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_XADD=y +# CONFIG_ZONE_DMA32 is not set diff --git a/target/linux/rdc/files/arch/i386/kernel/cpu/rdc.c b/target/linux/rdc/files/arch/x86/kernel/cpu/rdc.c index f4b9083bfc..f4b9083bfc 100644 --- a/target/linux/rdc/files/arch/i386/kernel/cpu/rdc.c +++ b/target/linux/rdc/files/arch/x86/kernel/cpu/rdc.c diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/Makefile b/target/linux/rdc/files/arch/x86/mach-rdc/Makefile index 5961bc7910..5961bc7910 100644 --- a/target/linux/rdc/files/arch/i386/mach-rdc/Makefile +++ b/target/linux/rdc/files/arch/x86/mach-rdc/Makefile diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/gpio.c b/target/linux/rdc/files/arch/x86/mach-rdc/gpio.c index dbd03270f1..dbd03270f1 100644 --- a/target/linux/rdc/files/arch/i386/mach-rdc/gpio.c +++ b/target/linux/rdc/files/arch/x86/mach-rdc/gpio.c diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/platform.c b/target/linux/rdc/files/arch/x86/mach-rdc/platform.c index 31af6fcc30..31af6fcc30 100644 --- a/target/linux/rdc/files/arch/i386/mach-rdc/platform.c +++ b/target/linux/rdc/files/arch/x86/mach-rdc/platform.c diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/setup.c b/target/linux/rdc/files/arch/x86/mach-rdc/setup.c index ad206c3d05..ad206c3d05 100644 --- a/target/linux/rdc/files/arch/i386/mach-rdc/setup.c +++ b/target/linux/rdc/files/arch/x86/mach-rdc/setup.c diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/wdt.c b/target/linux/rdc/files/arch/x86/mach-rdc/wdt.c index 13b69f68ab..13b69f68ab 100644 --- a/target/linux/rdc/files/arch/i386/mach-rdc/wdt.c +++ b/target/linux/rdc/files/arch/x86/mach-rdc/wdt.c diff --git a/target/linux/rdc/files/drivers/net/r6040.c b/target/linux/rdc/files/drivers/net/r6040.c index 6678f01a10..2334f4ebf9 100644 --- a/target/linux/rdc/files/drivers/net/r6040.c +++ b/target/linux/rdc/files/drivers/net/r6040.c @@ -1,42 +1,57 @@ -/* r6040.c: A RDC R6040 FastEthernet driver for linux. */ /* - Re-written 2004 by Sten Wang. - - Copyright 1994-2000 by Donald Becker. - Copyright 1993 United States Government as represented by the - Director, National Security Agency. This software may be used and - distributed according to the terms of the GNU General Public License, - incorporated herein by reference. - - This driver is for RDC R6040 FastEthernet MAC series. - For kernel version after 2.4.22 - - Modification List - ---------- ------------------------------------------------ - 10-07-2007 Clean up the driver using checkpatch - 08-24-2006 Support at linux 2.6.10 above - 03-24-2006 Support NAPI - 03-21-2006 By Charies,change spin_lock_irqsave(lp->lock, flags) - to spin_lock_irqsave(&lp->lock, flags) - in set_multicast_list - 03-15-2006 Modify the set_multicast_list ,due to when re-plug the ethernet, - it will forget the previous setting - 07-12-2005 Tim, modify the set_multicast_list - 03-28-2005 Tim, modify some error mac register offset in - function set_multicast_list - 03-27-2005 Tim, Add the internal state machine reset - Sten, If multicast address more than 4, enter PROM mode - Changed rdc to r6040 - 12-22-2004 Sten Init MAC MBCR register=0x012A - PHY_CAP = 0x01E1 - - Need to Do LIst: - 1. If multicast address more than 4, use the multicast address hash + * RDC R6040 Fast Ethernet MAC support + * + * Copyright (C) 2004 Sten Wang <sten.wang@rdc.com.tw> + * Copyright (C) 2007 + * Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> + * Florian Fainelli <florian@openwrt.org> + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/version.h> +#include <linux/moduleparam.h> +#include <linux/string.h> +#include <linux/timer.h> +#include <linux/errno.h> +#include <linux/ioport.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/pci.h> +#include <linux/netdevice.h> +#include <linux/etherdevice.h> +#include <linux/skbuff.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/mii.h> +#include <linux/ethtool.h> +#include <linux/crc32.h> +#include <linux/spinlock.h> +#include <linux/bitops.h> +#include <linux/io.h> +#include <linux/irq.h> +#include <linux/uaccess.h> + +#include <asm/processor.h> + #define DRV_NAME "r6040" -#define DRV_VERSION "0.13" -#define DRV_RELDATE "24Aug2006" +#define DRV_VERSION "0.16" +#define DRV_RELDATE "10Nov2007" /* PHY CHIP Address */ #define PHY1_ADDR 1 /* For MAC1 */ @@ -45,84 +60,95 @@ #define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */ /* Time in jiffies before concluding the transmitter is hung. */ -#define TX_TIMEOUT (6000 * HZ / 1000) +#define TX_TIMEOUT (6000 * HZ / 1000) #define TIMER_WUT (jiffies + HZ * 1)/* timer wakeup time : 1 second */ -/* RDC MAC ID */ -#define RDC_MAC_ID 0x6040 - /* RDC MAC I/O Size */ #define R6040_IO_SIZE 256 -/* RDC Chip PCI Command */ -#define R6040_PCI_CMD 0x0005 /* IO, Master */ - /* MAX RDC MAC */ #define MAX_MAC 2 -/* MAC setting */ +/* MAC registers */ +#define MCR0 0x00 /* Control register 0 */ +#define MCR1 0x04 /* Control register 1 */ +#define MAC_RST 0x0001 /* Reset the MAC */ +#define MBCR 0x08 /* Bus control */ +#define MT_ICR 0x0C /* TX interrupt control */ +#define MR_ICR 0x10 /* RX interrupt control */ +#define MTPR 0x14 /* TX poll command register */ +#define MR_BSR 0x18 /* RX buffer size */ +#define MR_DCR 0x1A /* RX descriptor control */ +#define MLSR 0x1C /* Last status */ +#define MMDIO 0x20 /* MDIO control register */ +#define MDIO_WRITE 0x4000 /* MDIO write */ +#define MDIO_READ 0x2000 /* MDIO read */ +#define MMRD 0x24 /* MDIO read data register */ +#define MMWD 0x28 /* MDIO write data register */ +#define MTD_SA0 0x2C /* TX descriptor start address 0 */ +#define MTD_SA1 0x30 /* TX descriptor start address 1 */ +#define MRD_SA0 0x34 /* RX descriptor start address 0 */ +#define MRD_SA1 0x38 /* RX descriptor start address 1 */ +#define MISR 0x3C /* Status register */ +#define MIER 0x40 /* INT enable register */ +#define MSK_INT 0x0000 /* Mask off interrupts */ +#define ME_CISR 0x44 /* Event counter INT status */ +#define ME_CIER 0x48 /* Event counter INT enable */ +#define MR_CNT 0x50 /* Successfully received packet counter */ +#define ME_CNT0 0x52 /* Event counter 0 */ +#define ME_CNT1 0x54 /* Event counter 1 */ +#define ME_CNT2 0x56 /* Event counter 2 */ +#define ME_CNT3 0x58 /* Event counter 3 */ +#define MT_CNT 0x5A /* Successfully transmit packet counter */ +#define ME_CNT4 0x5C /* Event counter 4 */ +#define MP_CNT 0x5E /* Pause frame counter register */ +#define MAR0 0x60 /* Hash table 0 */ +#define MAR1 0x62 /* Hash table 1 */ +#define MAR2 0x64 /* Hash table 2 */ +#define MAR3 0x66 /* Hash table 3 */ +#define MID_0L 0x68 /* Multicast address MID0 Low */ +#define MID_0M 0x6A /* Multicast address MID0 Medium */ +#define MID_0H 0x6C /* Multicast address MID0 High */ +#define MID_1L 0x70 /* MID1 Low */ +#define MID_1M 0x72 /* MID1 Medium */ +#define MID_1H 0x74 /* MID1 High */ +#define MID_2L 0x78 /* MID2 Low */ +#define MID_2M 0x7A /* MID2 Medium */ +#define MID_2H 0x7C /* MID2 High */ +#define MID_3L 0x80 /* MID3 Low */ +#define MID_3M 0x82 /* MID3 Medium */ +#define MID_3H 0x84 /* MID3 High */ +#define PHY_CC 0x88 /* PHY status change configuration register */ +#define PHY_ST 0x8A /* PHY status register */ +#define MAC_SM 0xAC /* MAC status machine */ +#define MAC_ID 0xBE /* Identifier register */ + #define TX_DCNT 0x80 /* TX descriptor count */ #define RX_DCNT 0x80 /* RX descriptor count */ #define MAX_BUF_SIZE 0x600 -#define ALLOC_DESC_SIZE ((TX_DCNT+RX_DCNT)*sizeof(struct r6040_descriptor)+0x10) +#define RX_DESC_SIZE (RX_DCNT * sizeof(struct r6040_descriptor)) +#define TX_DESC_SIZE (TX_DCNT * sizeof(struct r6040_descriptor)) #define MBCR_DEFAULT 0x012A /* MAC Bus Control Register */ +#define MCAST_MAX 4 /* Max number multicast addresses to filter */ /* PHY settings */ #define ICPLUS_PHY_ID 0x0243 -/* Debug enable or not */ -#define RDC_DEBUG 0 - -#if RDC_DEBUG > 1 -#define RDC_DBUG(msg, value) printk(KERN_ERR "%s %x\n", msg, value); -#else -#define RDC_DBUG(msg, value) -#endif - - -#include <linux/module.h> -#include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -#include <linux/moduleparam.h> -#endif -#include <linux/kernel.h> -#include <linux/string.h> -#include <linux/timer.h> -#include <linux/errno.h> -#include <linux/ioport.h> -#include <linux/slab.h> -#include <linux/interrupt.h> -#include <linux/pci.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/skbuff.h> -#include <linux/init.h> -#include <linux/delay.h> -#include <linux/mii.h> -#include <linux/ethtool.h> -#include <linux/crc32.h> -#include <linux/spinlock.h> - -#include <asm/processor.h> -#include <asm/bitops.h> -#include <asm/io.h> -#include <asm/irq.h> -#include <asm/uaccess.h> - -MODULE_AUTHOR("Sten Wang <sten.wang@rdc.com.tw>, Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>, Florian Fainelli <florian@openwrt.org>"); +MODULE_AUTHOR("Sten Wang <sten.wang@rdc.com.tw>," + "Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>," + "Florian Fainelli <florian@openwrt.org>"); MODULE_LICENSE("GPL"); -#ifdef CONFIG_R6040_NAPI -MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet Driver"); -#else -MODULE_DESCRIPTION("RDC R6040 PCI FastEthernet Driver"); -#endif +MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet driver"); -#define R6040_INT_MASK 0x0011 +#define RX_INT 0x0001 +#define TX_INT 0x0010 +#define RX_NO_DESC_INT 0x0002 +#define INT_MASK (RX_INT | TX_INT) struct r6040_descriptor { u16 status, len; /* 0-3 */ - u32 buf; /* 4-7 */ - u32 ndesc; /* 8-B */ + __le32 buf; /* 4-7 */ + __le32 ndesc; /* 8-B */ u32 rev1; /* C-F */ char *vbufp; /* 10-13 */ struct r6040_descriptor *vndescp; /* 14-17 */ @@ -131,728 +157,481 @@ struct r6040_descriptor { } __attribute__((aligned(32))); struct r6040_private { - struct net_device_stats stats; spinlock_t lock; /* driver lock */ struct timer_list timer; struct pci_dev *pdev; - struct r6040_descriptor *rx_insert_ptr; struct r6040_descriptor *rx_remove_ptr; struct r6040_descriptor *tx_insert_ptr; struct r6040_descriptor *tx_remove_ptr; + struct r6040_descriptor *rx_ring; + struct r6040_descriptor *tx_ring; + dma_addr_t rx_ring_dma; + dma_addr_t tx_ring_dma; u16 tx_free_desc, rx_free_desc, phy_addr, phy_mode; u16 mcr0, mcr1; - dma_addr_t desc_dma; - char *desc_pool; u16 switch_sig; + struct net_device *dev; + struct mii_if_info mii_if; + struct napi_struct napi; + struct net_device_stats stats; + u16 napi_rx_running; + void __iomem *base; }; -struct r6040_chip_info { - const char *name; - u16 pci_flags; - int io_size; - int drv_flags; -}; - -#ifdef CONFIG_R6040_NAPI -static int NAPI_status; -#endif - -static int __devinitdata printed_version; -#ifdef CONFIG_R6040_NAPI -static char version[] __devinitdata = - KERN_INFO DRV_NAME ": RDC R6040 NAPI net driver, version "DRV_VERSION " (" DRV_RELDATE ")\n"; -#else -static char version[] __devinitdata = - KERN_INFO DRV_NAME ": RDC R6040 net driver, version "DRV_VERSION " (" DRV_RELDATE ")\n"; -#endif -static struct r6040_chip_info r6040_chip_info[] __devinitdata = -{ - { "RDC R6040 Knight", R6040_PCI_CMD, R6040_IO_SIZE, 0} -}; -static char *parent; - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -static int NUM_MAC_TABLE = 2 ; -module_param(parent, charp, 0444); -#else -MODULE_PARM(parent, "s"); -#endif -MODULE_PARM_DESC(parent, "Parent network device name"); - -static int phy_table[] = { 0x1, 0x2}; -static u8 adr_table[2][8] = { - {0x00, 0x00, 0x60, 0x00, 0x00, 0x01}, - {0x00, 0x00, 0x60, 0x00, 0x00, 0x02} -}; - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10) - module_param_array(adr_table, int, &NUM_MAC_TABLE, 0644); -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) - module_param_array(adr_table, int, NUM_MAC_TABLE, 0644); -#else - MODULE_PARM(adr_table, "2-4i"); -#endif -MODULE_PARM_DESC(adr_table, "MAC Address (assigned)"); - -static int r6040_open(struct net_device *dev); -static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev); -static irqreturn_t r6040_interrupt(int irq, void *dev_id); -static struct net_device_stats *r6040_get_stats(struct net_device *dev); -static int r6040_close(struct net_device *dev); -static void set_multicast_list(struct net_device *dev); -static struct ethtool_ops netdev_ethtool_ops; -static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); -static void r6040_down(struct net_device *dev); -static void r6040_up(struct net_device *dev); -static void r6040_tx_timeout (struct net_device *dev); -static void r6040_timer(unsigned long); - -static int phy_mode_chk(struct net_device *dev); -static int phy_read(int ioaddr, int phy_adr, int reg_idx); -static void phy_write(int ioaddr, int phy_adr, int reg_idx, int dat); -static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev); -#ifdef CONFIG_R6040_NAPI -static int r6040_poll(struct net_device *netdev, int *budget); -#endif +static char version[] __devinitdata = KERN_INFO DRV_NAME + ": RDC R6040 NAPI net driver," + "version "DRV_VERSION " (" DRV_RELDATE ")\n"; +static int phy_table[] = { PHY1_ADDR, PHY2_ADDR }; -static int __devinit r6040_init_one (struct pci_dev *pdev, - const struct pci_device_id *ent) +/* Read a word data from PHY Chip */ +static int phy_read(void __iomem *ioaddr, int phy_addr, int reg) { - struct net_device *dev; - struct r6040_private *lp; - int ioaddr, io_size, err; - static int card_idx = -1; - int chip_id = (int)ent->driver_data; - - RDC_DBUG("r6040_init_one()", 0); - - if (printed_version++) - printk(KERN_INFO "%s\n", version); - - err = pci_enable_device(pdev); - if (err) - return err; - - /* this should always be supported */ - if (pci_set_dma_mask(pdev, 0xffffffff)) { - printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses not supported by the card!?\n"); - return -ENODEV; - } - - /* IO Size check */ - io_size = r6040_chip_info[chip_id].io_size; - if (pci_resource_len (pdev, 0) < io_size) { - return -ENODEV; - } - - ioaddr = pci_resource_start (pdev, 0); /* IO map base address */ - pci_set_master(pdev); - - dev = alloc_etherdev(sizeof(struct r6040_private)); - if (dev == NULL) - return -ENOMEM; - SET_MODULE_OWNER(dev); - - if (pci_request_regions(pdev, DRV_NAME)) { - printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n"); - err = -ENODEV; - goto err_out_disable; - } - - /* Init system & device */ - lp = dev->priv; - dev->base_addr = ioaddr; - dev->irq = pdev->irq; - - spin_lock_init(&lp->lock); - pci_set_drvdata(pdev, dev); - - /* Set MAC address */ - card_idx++; - memcpy(dev->dev_addr, (u8 *)&adr_table[card_idx][0], 6); - - /* Link new device into r6040_root_dev */ - lp->pdev = pdev; - - /* Init RDC private data */ - lp->mcr0 = 0x1002; - lp->phy_addr = phy_table[card_idx]; - lp->switch_sig = 0; - - /* The RDC-specific entries in the device structure. */ - dev->open = &r6040_open; - dev->hard_start_xmit = &r6040_start_xmit; - dev->stop = &r6040_close; - dev->get_stats = &r6040_get_stats; - dev->set_multicast_list = &set_multicast_list; - dev->do_ioctl = &netdev_ioctl; - dev->ethtool_ops = &netdev_ethtool_ops; - dev->tx_timeout = &r6040_tx_timeout; - dev->watchdog_timeo = TX_TIMEOUT; -#ifdef CONFIG_R6040_NAPI - dev->poll = &r6040_poll; - dev->weight = 64; -#endif - - /* Register net device. After this dev->name assign */ - err = register_netdev(dev); - if (err) { - printk(KERN_ERR DRV_NAME ": Failed to register net device\n"); - goto err_out_res; + int limit = 2048; + u16 cmd; + + iowrite16(MDIO_READ + reg + (phy_addr << 8), ioaddr + MMDIO); + /* Wait for the read bit to be cleared */ + while (limit--) { + cmd = ioread16(ioaddr + MMDIO); + if (cmd & MDIO_READ) + break; } - netif_carrier_on(dev); - return 0; - -err_out_res: - pci_release_regions(pdev); -err_out_disable: - pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); - kfree(dev); - - return err; + return ioread16(ioaddr + MMRD); } -static void __devexit r6040_remove_one (struct pci_dev *pdev) +/* Write a word data from PHY Chip */ +static void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) { - struct net_device *dev = pci_get_drvdata(pdev); - - unregister_netdev(dev); - pci_release_regions(pdev); - kfree(dev); - pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); + int limit = 2048; + u16 cmd; + + iowrite16(val, ioaddr + MMWD); + /* Write the command to the MDIO bus */ + iowrite16(MDIO_WRITE + reg + (phy_addr << 8), ioaddr + MMDIO); + /* Wait for the write bit to be cleared */ + while (limit--) { + cmd = ioread16(ioaddr + MMDIO); + if (cmd & MDIO_WRITE) + break; + } } -static int -r6040_open(struct net_device *dev) +static int mdio_read(struct net_device *dev, int mii_id, int reg) { - struct r6040_private *lp = dev->priv; - int i; - - RDC_DBUG("r6040_open()", 0); - - /* Request IRQ and Register interrupt handler */ - i = request_irq(dev->irq, &r6040_interrupt, SA_SHIRQ, dev->name, dev); - if (i) return i; + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; - /* Allocate Descriptor memory */ - lp->desc_pool = pci_alloc_consistent(lp->pdev, ALLOC_DESC_SIZE, &lp->desc_dma); - if (!lp->desc_pool) - return -ENOMEM; - - r6040_up(dev); + return (phy_read(ioaddr, lp->phy_addr, reg)); +} - netif_start_queue(dev); +static void mdio_write(struct net_device *dev, int mii_id, int reg, int val) +{ + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; - if (lp->switch_sig != ICPLUS_PHY_ID) { - /* set and active a timer process */ - init_timer(&lp->timer); - lp->timer.expires = TIMER_WUT; - lp->timer.data = (unsigned long)dev; - lp->timer.function = &r6040_timer; - add_timer(&lp->timer); - } - return 0; + phy_write(ioaddr, lp->phy_addr, reg, val); } -static void -r6040_tx_timeout (struct net_device *dev) +static void r6040_tx_timeout(struct net_device *dev) { - struct r6040_private *lp = dev->priv; - /* int ioaddr = dev->base_addr; - struct r6040_descriptor *descptr = lp->tx_remove_ptr; */ + struct r6040_private *priv = netdev_priv(dev); - RDC_DBUG("r6040_tx_timeout()", 0); + disable_irq(dev->irq); + napi_disable(&priv->napi); + spin_lock(&priv->lock); + dev->stats.tx_errors++; + spin_unlock(&priv->lock); - /* Transmitter timeout, serious problems. */ - /* Sten: Nothing need to do so far. */ - printk(KERN_ERR DRV_NAME ": Big Trobule, transmit timeout/n"); - lp->stats.tx_errors++; netif_stop_queue(dev); - -//printk("<RDC> XMT timedout: CR0 %x, CR40 %x, CR3C %x, CR2C %x, CR30 %x, CR34 %x, CR38 %x\n", inw(ioaddr), inw(ioaddr+0x40), inw(ioaddr+0x3c), inw(ioaddr+0x2c), inw(ioaddr+0x30), inw(ioaddr+0x34), inw(ioaddr+0x38)); - -//printk("<RDC> XMT_TO: %08lx:%04x %04x %08lx %08lx %08lx %08lx\n", descptr, descptr->status, descptr->len, descptr->buf, descptr->skb_ptr, descptr->ndesc, descptr->vndescp); } - -static int -r6040_start_xmit(struct sk_buff *skb, struct net_device *dev) +/* Allocate skb buffer for rx descriptor */ +static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev) { - struct r6040_private *lp = dev->priv; struct r6040_descriptor *descptr; - int ioaddr = dev->base_addr; - unsigned long flags; - - RDC_DBUG("r6040_start_xmit()", 0); - - if (skb == NULL) /* NULL skb directly return */ - return 0; - if (skb->len >= MAX_BUF_SIZE) { /* Packet too long, drop it */ - dev_kfree_skb(skb); - return 0; - } + void __iomem *ioaddr = lp->base; - /* Critical Section */ - spin_lock_irqsave(&lp->lock, flags); + descptr = lp->rx_insert_ptr; + while (lp->rx_free_desc < RX_DCNT) { + descptr->skb_ptr = dev_alloc_skb(MAX_BUF_SIZE); - /* TX resource check */ - if (!lp->tx_free_desc) { - spin_unlock_irqrestore(&lp->lock, flags); - printk(KERN_ERR DRV_NAME ": NO TX DESC "); - return 1; + if (!descptr->skb_ptr) + break; + descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, + descptr->skb_ptr->data, + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); + descptr->status = 0x8000; + descptr = descptr->vndescp; + lp->rx_free_desc++; + /* Trigger RX DMA */ + iowrite16(lp->mcr0 | 0x0002, ioaddr); } - - /* Statistic Counter */ - lp->stats.tx_packets++; - lp->stats.tx_bytes += skb->len; - - /* Set TX descriptor & Transmit it */ - lp->tx_free_desc--; - descptr = lp->tx_insert_ptr; - if (skb->len < 0x3c) - descptr->len = 0x3c; - else - descptr->len = skb->len; - - descptr->skb_ptr = skb; - descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE)); - descptr->status = 0x8000; - outw(0x01, ioaddr + 0x14); - lp->tx_insert_ptr = descptr->vndescp; - -#if RDC_DEBUG - printk("Xmit(): %08lx:%04x %04x %08lx %08lx %08lx %08lx\n", descptr, descptr->status, descptr->len, descptr->buf, descptr->skb_ptr, descptr->ndesc, descptr->vndescp); -#endif - - /* If no tx resource, stop */ - if (!lp->tx_free_desc) - netif_stop_queue(dev); - - dev->trans_start = jiffies; - spin_unlock_irqrestore(&lp->lock, flags); - return 0; + lp->rx_insert_ptr = descptr; } -/* The RDC interrupt handler. */ -static irqreturn_t -r6040_interrupt(int irq, void *dev_id) + +static struct net_device_stats *r6040_get_stats(struct net_device *dev) { - struct net_device *dev = dev_id; - struct r6040_private *lp; - struct r6040_descriptor *descptr; - struct sk_buff *skb_ptr; - int ioaddr, status; + struct r6040_private *priv = netdev_priv(dev); + void __iomem *ioaddr = priv->base; unsigned long flags; -#ifdef CONFIG_R6040_NAPI - int handled = 1; -#else - int handled = 0; -#endif - RDC_DBUG("r6040_interrupt()", 0); - if (dev == NULL) { - printk (KERN_ERR DRV_NAME ": INT() unknown device.\n"); - return IRQ_RETVAL(handled); - } + spin_lock_irqsave(&priv->lock, flags); + priv->stats.rx_crc_errors += ioread8(ioaddr + ME_CNT1); + priv->stats.multicast += ioread8(ioaddr + ME_CNT0); + spin_unlock_irqrestore(&priv->lock, flags); - lp = (struct r6040_private *)dev->priv; - spin_lock_irqsave(&lp->lock, flags); + return &priv->stats; +} - /* Check MAC Interrupt status */ - ioaddr = dev->base_addr; - outw(0x0, ioaddr + 0x40); /* Mask Off RDC MAC interrupt */ - status = inw(ioaddr + 0x3c); /* Read INTR status and clear */ - +/* Stop RDC MAC and Free the allocated resource */ +static void r6040_down(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; + struct pci_dev *pdev = lp->pdev; + int i; + int limit = 2048; + u16 *adrp; + u16 cmd; -#ifdef CONFIG_R6040_NAPI - if (netif_rx_schedule_prep(dev)) { - NAPI_status = status; - __netif_rx_schedule(dev); + /* Stop MAC */ + iowrite16(MSK_INT, ioaddr + MIER); /* Mask Off Interrupt */ + iowrite16(MAC_RST, ioaddr + MCR1); /* Reset RDC MAC */ + while (limit--) { + cmd = ioread16(ioaddr + MCR1); + if (cmd & 0x1) + break; } - spin_unlock_irqrestore(&lp->lock, flags); - return IRQ_RETVAL(handled); -#else - /* TX interrupt request */ - if (status & 0x10) { - handled = 1; - descptr = lp->tx_remove_ptr; - while (lp->tx_free_desc < TX_DCNT) { - if (descptr->status & 0x8000) - break; /* Not complte */ - skb_ptr = descptr->skb_ptr; - pci_unmap_single(lp->pdev, descptr->buf, skb_ptr->len, PCI_DMA_TODEVICE); - dev_kfree_skb_irq(skb_ptr); /* Free buffer */ - descptr->skb_ptr = 0; - descptr = descptr->vndescp; /* To next descriptor */ - lp->tx_free_desc++; + /* Restore MAC Address to MIDx */ + adrp = (u16 *) dev->dev_addr; + iowrite16(adrp[0], ioaddr + MID_0L); + iowrite16(adrp[1], ioaddr + MID_0M); + iowrite16(adrp[2], ioaddr + MID_0H); + free_irq(dev->irq, dev); + /* Free RX buffer */ + for (i = 0; i < RX_DCNT; i++) { + if (lp->rx_insert_ptr->skb_ptr) { + pci_unmap_single(lp->pdev, lp->rx_insert_ptr->buf, + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); + dev_kfree_skb(lp->rx_insert_ptr->skb_ptr); + lp->rx_insert_ptr->skb_ptr = NULL; } - lp->tx_remove_ptr = descptr; - if (lp->tx_free_desc) - netif_wake_queue(dev); - } + lp->rx_insert_ptr = lp->rx_insert_ptr->vndescp; + } - /* RX interrupt request */ - if (status & 0x01) { - handled = 1; - descptr = lp->rx_remove_ptr; - while(lp->rx_free_desc) { - if (descptr->status & 0x8000) break; /* No Rx packet */ - skb_ptr = descptr->skb_ptr; - descptr->skb_ptr = 0; - skb_ptr->dev = dev; - skb_put(skb_ptr, descptr->len - 4); - pci_unmap_single(lp->pdev, descptr->buf, MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); - skb_ptr->protocol = eth_type_trans(skb_ptr, dev); - netif_rx(skb_ptr); /* Send to upper layer */ - lp->stats.rx_packets++; - lp->stats.rx_bytes += descptr->len; - descptr = descptr->vndescp; /* To next descriptor */ - lp->rx_free_desc--; + /* Free TX buffer */ + for (i = 0; i < TX_DCNT; i++) { + if (lp->tx_insert_ptr->skb_ptr) { + pci_unmap_single(lp->pdev, lp->tx_insert_ptr->buf, + MAX_BUF_SIZE, PCI_DMA_TODEVICE); + dev_kfree_skb(lp->tx_insert_ptr->skb_ptr); + lp->rx_insert_ptr->skb_ptr = NULL; } - lp->rx_remove_ptr = descptr; + lp->tx_insert_ptr = lp->tx_insert_ptr->vndescp; } - /* Allocate new RX buffer */ - if (lp->rx_free_desc < RX_DCNT) rx_buf_alloc(lp,dev); - - outw(R6040_INT_MASK, ioaddr + 0x40); /* TX/RX interrupt enable */ - spin_unlock_irqrestore(&lp->lock, flags); -#endif - return IRQ_RETVAL(handled); + /* Free Descriptor memory */ + pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma); + pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma); } - -static struct net_device_stats * -r6040_get_stats(struct net_device *dev) +static int r6040_close(struct net_device *dev) { - struct r6040_private *lp = dev->priv; - - RDC_DBUG("r6040_get_stats()", 0); - return &lp->stats; -} + struct r6040_private *lp = netdev_priv(dev); -/* - * Set or clear the multicast filter for this adaptor. - */ -static void -set_multicast_list(struct net_device *dev) -{ - struct r6040_private *lp = dev->priv; - struct dev_mc_list *mcptr; - int ioaddr = dev->base_addr; - u16 *adrp, i; - unsigned long flags; + /* deleted timer */ + del_timer_sync(&lp->timer); - RDC_DBUG("set_multicast_list()", 0); + spin_lock_irq(&lp->lock); + netif_stop_queue(dev); + r6040_down(dev); + spin_unlock_irq(&lp->lock); - /* MAC Address */ - adrp = (u16 *) dev->dev_addr; - outw(adrp[0], ioaddr + 0x68); - outw(adrp[1], ioaddr + 0x6A); - outw(adrp[2], ioaddr + 0x6C); + return 0; +} +/* Status of PHY CHIP */ +static int phy_mode_chk(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; + int phy_dat; -#if RDC_DEBUG - printk("MAC ADDR: %04x %04x %04x\n", adrp[0], adrp[1], adrp[2]); -#endif + /* PHY Link Status Check */ + phy_dat = phy_read(ioaddr, lp->phy_addr, 1); + if (!(phy_dat & 0x4)) + phy_dat = 0x8000; /* Link Failed, full duplex */ - /* Promiscous Mode */ - spin_lock_irqsave(&lp->lock, flags); - i = inw(ioaddr) & ~0x0120; /* Clear AMCP & PROM */ - if (dev->flags & IFF_PROMISC) { - i |= 0x0020; - lp->mcr0 |= 0x0020; + /* PHY Chip Auto-Negotiation Status */ + phy_dat = phy_read(ioaddr, lp->phy_addr, 1); + if (phy_dat & 0x0020) { + /* Auto Negotiation Mode */ + phy_dat = phy_read(ioaddr, lp->phy_addr, 5); + phy_dat &= phy_read(ioaddr, lp->phy_addr, 4); + if (phy_dat & 0x140) + /* Force full duplex */ + phy_dat = 0x8000; + else + phy_dat = 0; + } else { + /* Force Mode */ + phy_dat = phy_read(ioaddr, lp->phy_addr, 0); + if (phy_dat & 0x100) + phy_dat = 0x8000; + else + phy_dat = 0x0000; } - if (dev->mc_count > 4) - i |= 0x0020; /* Too many multicast address */ - - outw(i, ioaddr); - spin_unlock_irqrestore(&lp->lock, flags); - - /* Multicast Address */ - if (dev->mc_count > 4) /* Wait to do: Hash Table for multicast */ - return; - /* Multicast Address 1~4 case */ - for (i = 0, mcptr = dev->mc_list; (i < dev->mc_count) && (i < 4); i++) { - adrp = (u16 *)mcptr->dmi_addr; - outw(adrp[0], ioaddr + 0x70 + 8*i); - outw(adrp[1], ioaddr + 0x72 + 8*i); - outw(adrp[2], ioaddr + 0x74 + 8*i); - mcptr = mcptr->next; -#if RDC_DEBUG - printk("M_ADDR: %04x %04x %04x\n", adrp[0], adrp[1], adrp[2]); -#endif - } - for (i = dev->mc_count; i < 4; i++) { - outw(0xffff, ioaddr + 0x68 + 8*i); - outw(0xffff, ioaddr + 0x6A + 8*i); - outw(0xffff, ioaddr + 0x6C + 8*i); - } -} + return phy_dat; +}; -static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info) +static void r6040_set_carrier(struct mii_if_info *mii) { - struct r6040_private *rp = dev->priv; - - strcpy (info->driver, DRV_NAME); - strcpy (info->version, DRV_VERSION); - strcpy (info->bus_info, pci_name(rp->pdev)); + if (phy_mode_chk(mii->dev)) { + /* autoneg is off: Link is always assumed to be up */ + if (!netif_carrier_ok(mii->dev)) + netif_carrier_on(mii->dev); + } else + phy_mode_chk(mii->dev); } -static struct ethtool_ops netdev_ethtool_ops = { - .get_drvinfo = netdev_get_drvinfo, -}; - -static int -r6040_close(struct net_device *dev) +static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct r6040_private *lp = dev->priv; - - RDC_DBUG("r6040_close()", 0); - - /* deleted timer */ - del_timer_sync(&lp->timer); + struct r6040_private *lp = netdev_priv(dev); + struct mii_ioctl_data *data = if_mii(rq); + int rc; + if (!netif_running(dev)) + return -EINVAL; spin_lock_irq(&lp->lock); - - netif_stop_queue(dev); - - r6040_down(dev); - + rc = generic_mii_ioctl(&lp->mii_if, data, cmd, NULL); spin_unlock_irq(&lp->lock); - - return 0; + r6040_set_carrier(&lp->mii_if); + return rc; } -static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) +static int r6040_rx(struct net_device *dev, int limit) { - struct r6040_private *lp = dev->priv; + struct r6040_private *priv = netdev_priv(dev); + int count; + void __iomem *ioaddr = priv->base; + u16 err; + + for (count = 0; count < limit; ++count) { + struct r6040_descriptor *descptr = priv->rx_remove_ptr; + struct sk_buff *skb_ptr; + + /* Disable RX interrupt */ + iowrite16(ioread16(ioaddr + MIER) & (~RX_INT), ioaddr + MIER); + descptr = priv->rx_remove_ptr; + + /* Check for errors */ + err = ioread16(ioaddr + MLSR); + if (err & 0x0400) priv->stats.rx_errors++; + /* RX FIFO over-run */ + if (err & 0x8000) priv->stats.rx_fifo_errors++; + /* RX descriptor unavailable */ + if (err & 0x0080) priv->stats.rx_frame_errors++; + /* Received packet with length over buffer lenght */ + if (err & 0x0020) priv->stats.rx_over_errors++; + /* Received packet with too long or short */ + if (err & (0x0010|0x0008)) priv->stats.rx_length_errors++; + /* Received packet with CRC errors */ + if (err & 0x0004) { + spin_lock(&priv->lock); + priv->stats.rx_crc_errors++; + spin_unlock(&priv->lock); + } - RDC_DBUG("netdev_ioctl()", 0); + while (priv->rx_free_desc) { + /* No RX packet */ + if (descptr->status & 0x8000) + break; + skb_ptr = descptr->skb_ptr; + if (!skb_ptr) { + printk(KERN_ERR "%s: Inconsistent RX" + "descriptor chain\n", + dev->name); + break; + } + descptr->skb_ptr = NULL; + skb_ptr->dev = priv->dev; + /* Do not count the CRC */ + skb_put(skb_ptr, descptr->len - 4); + pci_unmap_single(priv->pdev, descptr->buf, + MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); + skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev); + /* Send to upper layer */ + netif_receive_skb(skb_ptr); + dev->last_rx = jiffies; + priv->dev->stats.rx_packets++; + priv->dev->stats.rx_bytes += descptr->len; + /* To next descriptor */ + descptr = descptr->vndescp; + priv->rx_free_desc--; + } + priv->rx_remove_ptr = descptr; + } + /* Allocate new RX buffer */ + if (priv->rx_free_desc < RX_DCNT) + rx_buf_alloc(priv, priv->dev); - if (lp->switch_sig == ICPLUS_PHY_ID && cmd == SIOCDEVPRIVATE) { - unsigned long *data = (unsigned long *)rq->ifr_data, args[4]; - int ioaddr = dev->base_addr; - unsigned int val; + return count; +} - data = (unsigned long *)rq->ifr_data; - if (copy_from_user(args, data, 4*sizeof(unsigned long))) - return -EFAULT; +static void r6040_tx(struct net_device *dev) +{ + struct r6040_private *priv = netdev_priv(dev); + struct r6040_descriptor *descptr; + void __iomem *ioaddr = priv->base; + struct sk_buff *skb_ptr; + u16 err; + + spin_lock(&priv->lock); + descptr = priv->tx_remove_ptr; + while (priv->tx_free_desc < TX_DCNT) { + /* Check for errors */ + err = ioread16(ioaddr + MLSR); + + if (err & 0x0200) priv->stats.rx_fifo_errors++; + if (err & (0x2000 | 0x4000)) priv->stats.tx_carrier_errors++; + + if (descptr->status & 0x8000) + break; /* Not complte */ + skb_ptr = descptr->skb_ptr; + pci_unmap_single(priv->pdev, descptr->buf, + skb_ptr->len, PCI_DMA_TODEVICE); + /* Free buffer */ + dev_kfree_skb_irq(skb_ptr); + descptr->skb_ptr = NULL; + /* To next descriptor */ + descptr = descptr->vndescp; + priv->tx_free_desc++; + } + priv->tx_remove_ptr = descptr; - /* port priority */ - if(args[0]&(1<<31))phy_write(ioaddr, 29, 19, (phy_read(ioaddr, 29, 19) | 0x2000)); /* port 0 */ - if(args[0]&(1<<29))phy_write(ioaddr, 29, 19, (phy_read(ioaddr, 29, 19) | 0x0020)); /* port 1 */ - if(args[0]&(1<<27))phy_write(ioaddr, 29, 20, (phy_read(ioaddr, 29, 20) | 0x2000)); /* port 2 */ - if(args[0]&(1<<25))phy_write(ioaddr, 29, 20, (phy_read(ioaddr, 29, 20) | 0x0020)); /* port 3 */ + if (priv->tx_free_desc) + netif_wake_queue(dev); + spin_unlock(&priv->lock); +} +static int r6040_poll(struct napi_struct *napi, int budget) +{ + struct r6040_private *priv = + container_of(napi, struct r6040_private, napi); + struct net_device *dev = priv->dev; + void __iomem *ioaddr = priv->base; + int work_done; + + work_done = r6040_rx(dev, budget); + + if (work_done < budget) { + netif_rx_complete(dev, napi); + /* Enable RX interrupt */ + iowrite16(ioread16(ioaddr + MIER) | RX_INT, ioaddr + MIER); } - return -EOPNOTSUPP; + return work_done; } -/** - Stop RDC MAC and Free the allocated resource - */ -static void r6040_down(struct net_device *dev) +/* The RDC interrupt handler. */ +static irqreturn_t r6040_interrupt(int irq, void *dev_id) { - struct r6040_private *lp = dev->priv; - int i; - int ioaddr = dev->base_addr; + struct net_device *dev = dev_id; + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; + u16 status; + int handled = 1; - RDC_DBUG("r6040_down()", 0); + /* Mask off RDC MAC interrupt */ + iowrite16(MSK_INT, ioaddr + MIER); + /* Read MISR status and clear */ + status = ioread16(ioaddr + MISR); - /* Stop MAC */ - outw(0x0000, ioaddr + 0x40); /* Mask Off Interrupt */ - outw(0x0001, ioaddr + 0x04); /* Reset RDC MAC */ - i = 0; - do{}while((i++ < 2048) && (inw(ioaddr + 0x04) & 0x1)); - - free_irq(dev->irq, dev); + if (status == 0x0000 || status == 0xffff) + return IRQ_NONE; - /* Free RX buffer */ - for (i = 0; i < RX_DCNT; i++) { - if (lp->rx_insert_ptr->skb_ptr) { - pci_unmap_single(lp->pdev, lp->rx_insert_ptr->buf, MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); - dev_kfree_skb(lp->rx_insert_ptr->skb_ptr); - lp->rx_insert_ptr->skb_ptr = 0; - } - lp->rx_insert_ptr = lp->rx_insert_ptr->vndescp; + /* RX interrupt request */ + if (status & 0x01) { + netif_rx_schedule(dev, &lp->napi); + iowrite16(TX_INT, ioaddr + MIER); } - /* Free TX buffer */ - for (i = 0; i < TX_DCNT; i++) { - if (lp->tx_insert_ptr->skb_ptr) { - pci_unmap_single(lp->pdev, lp->tx_insert_ptr->buf, MAX_BUF_SIZE, PCI_DMA_TODEVICE); - dev_kfree_skb(lp->tx_insert_ptr->skb_ptr); - lp->rx_insert_ptr->skb_ptr = 0; - } - lp->tx_insert_ptr = lp->tx_insert_ptr->vndescp; - } + /* TX interrupt request */ + if (status & 0x10) + r6040_tx(dev); - /* Free Descriptor memory */ - pci_free_consistent(lp->pdev, ALLOC_DESC_SIZE, lp->desc_pool, lp->desc_dma); + return IRQ_RETVAL(handled); } +#ifdef CONFIG_NET_POLL_CONTROLLER +static void r6040_poll_controller(struct net_device *dev) +{ + disable_irq(dev->irq); + r6040_interrupt(dev->irq, dev); + enable_irq(dev->irq); +} +#endif - -#ifdef CONFIG_R6040_NAPI -static int r6040_poll(struct net_device *dev, int *budget) +static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring, + dma_addr_t desc_dma, int size) { - struct r6040_private *lp; - struct r6040_descriptor *descptr; - struct sk_buff *skb_ptr; - int ioaddr, status; - unsigned long flags; - - - ioaddr = dev->base_addr; - lp = (struct r6040_private *)dev->priv; - unsigned long rx_work = dev->quota; - unsigned long rx; -#if 1 - /* TX interrupt request */ - if (NAPI_status & 0x10) { - descptr = lp->tx_remove_ptr; - while (lp->tx_free_desc < TX_DCNT) { - if (descptr->status & 0x8000) - break; /* Not complte */ - - skb_ptr = descptr->skb_ptr; - pci_unmap_single(lp->pdev, descptr->buf, skb_ptr->len, PCI_DMA_TODEVICE); - dev_kfree_skb_irq(skb_ptr); /* Free buffer */ - descptr->skb_ptr = 0; - descptr = descptr->vndescp; /* To next descriptor */ - lp->tx_free_desc++; - } - lp->tx_remove_ptr = descptr; - if (lp->tx_free_desc) netif_wake_queue(dev); + struct r6040_descriptor *desc = desc_ring; + dma_addr_t mapping = desc_dma; + + while (size-- > 0) { + mapping += sizeof(sizeof(*desc)); + desc->ndesc = cpu_to_le32(mapping); + desc->vndescp = desc + 1; + desc++; } -#endif -#if 1 - /* RX interrupt request */ - if (NAPI_status & 0x01) { - descptr = lp->rx_remove_ptr; - while (lp->rx_free_desc) { - if (descptr->status & 0x8000) - break; /* No Rx packet */ - skb_ptr = descptr->skb_ptr; - descptr->skb_ptr = 0; - skb_ptr->dev = dev; - skb_put(skb_ptr, descptr->len - 4); - pci_unmap_single(lp->pdev, descptr->buf, MAX_BUF_SIZE, PCI_DMA_FROMDEVICE); - skb_ptr->protocol = eth_type_trans(skb_ptr, dev); - netif_receive_skb(skb_ptr); /* Send to upper layer */ - lp->stats.rx_packets++; - lp->stats.rx_bytes += descptr->len; - descptr = descptr->vndescp; /* To next descriptor */ - lp->rx_free_desc--; - } - lp->rx_remove_ptr = descptr; - } - /* Allocate new RX buffer */ - if (lp->rx_free_desc < RX_DCNT) - rx_buf_alloc(lp, dev); - - local_irq_disable(); - netif_rx_complete(dev); - outw(R6040_INT_MASK, ioaddr + 0x40); - local_irq_enable(); - return 0; -#endif + desc--; + desc->ndesc = cpu_to_le32(desc_dma); + desc->vndescp = desc_ring; } -#endif /* Init RDC MAC */ static void r6040_up(struct net_device *dev) { - struct r6040_private *lp = dev->priv; - struct r6040_descriptor *descptr; - int i; - int ioaddr = dev->base_addr; - u32 tmp_addr; - dma_addr_t desc_dma, start_dma; - - RDC_DBUG("r6040_up()", 0); + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; - /* Initilize */ + /* Initialize */ lp->tx_free_desc = TX_DCNT; lp->rx_free_desc = 0; - /* Init descriptor */ - memset(lp->desc_pool, 0, ALLOC_DESC_SIZE); /* Let all descriptor = 0 */ - lp->tx_insert_ptr = (struct r6040_descriptor *)lp->desc_pool; - lp->tx_remove_ptr = lp->tx_insert_ptr; - lp->rx_insert_ptr = (struct r6040_descriptor *)lp->tx_insert_ptr+TX_DCNT; - lp->rx_remove_ptr = lp->rx_insert_ptr; - + lp->tx_remove_ptr = lp->tx_insert_ptr = lp->tx_ring; + lp->rx_remove_ptr = lp->rx_insert_ptr = lp->rx_ring; /* Init TX descriptor */ - descptr = lp->tx_insert_ptr; - desc_dma = lp->desc_dma; - start_dma = desc_dma; - for (i = 0; i < TX_DCNT; i++) { - descptr->ndesc = cpu_to_le32(desc_dma + sizeof(struct r6040_descriptor)); - descptr->vndescp = (descptr + 1); - descptr = (descptr + 1); - desc_dma += sizeof(struct r6040_descriptor); - } - (descptr - 1)->ndesc = cpu_to_le32(start_dma); - (descptr - 1)->vndescp = lp->tx_insert_ptr; + r6040_init_ring_desc(lp->tx_ring, lp->tx_ring_dma, TX_DCNT); /* Init RX descriptor */ - start_dma = desc_dma; - descptr = lp->rx_insert_ptr; - for (i = 0; i < RX_DCNT; i++) { - descptr->ndesc = cpu_to_le32(desc_dma + sizeof(struct r6040_descriptor)); - descptr->vndescp = (descptr + 1); - descptr = (descptr + 1); - desc_dma += sizeof(struct r6040_descriptor); - } - (descptr - 1)->ndesc = cpu_to_le32(start_dma); - (descptr - 1)->vndescp = lp->rx_insert_ptr; + r6040_init_ring_desc(lp->rx_ring, lp->rx_ring_dma, RX_DCNT); /* Allocate buffer for RX descriptor */ rx_buf_alloc(lp, dev); -#if RDC_DEBUG -descptr = lp->tx_insert_ptr; -for (i = 0; i < TX_DCNT; i++) { - printk("%08lx:%04x %04x %08lx %08lx %08lx %08lx\n", descptr, descptr->status, descptr->len, descptr->buf, descptr->skb_ptr, descptr->ndesc, descptr->vndescp); - descptr = descptr->vndescp; -} -descptr = lp->rx_insert_ptr; -for (i = 0; i < RX_DCNT; i++) { - printk("%08lx:%04x %04x %08lx %08lx %08lx %08lx\n", descptr, descptr->status, descptr->len, descptr->buf, descptr->skb_ptr, descptr->ndesc, descptr->vndescp); - descptr = descptr->vndescp; -} -#endif - - /* MAC operation register */ - outw(0x01, ioaddr+0x04); /* Reset MAC */ - outw(2, ioaddr+0xAC); /* Reset internal state machine */ - outw(0, ioaddr+0xAC); - udelay(5000); + /* + * TX and RX descriptor start registers. + * Lower 16-bits to MxD_SA0. Higher 16-bits to MxD_SA1. + */ + iowrite16(lp->tx_ring_dma, ioaddr + MTD_SA0); + iowrite16(lp->tx_ring_dma >> 16, ioaddr + MTD_SA1); - /* TX and RX descriptor start Register */ - tmp_addr = cpu_to_le32(lp->tx_insert_ptr); - tmp_addr = virt_to_bus((volatile void *)tmp_addr); - outw((u16) tmp_addr, ioaddr+0x2c); - outw(tmp_addr >> 16, ioaddr+0x30); - tmp_addr = cpu_to_le32(lp->rx_insert_ptr); - tmp_addr = virt_to_bus((volatile void *)tmp_addr); - outw((u16) tmp_addr, ioaddr+0x34); - outw(tmp_addr >> 16, ioaddr+0x38); + iowrite16(lp->rx_ring_dma, ioaddr + MRD_SA0); + iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1); /* Buffer Size Register */ - outw(MAX_BUF_SIZE, ioaddr+0x18); + iowrite16(MAX_BUF_SIZE, ioaddr + MR_BSR); + /* Read the PHY ID */ + lp->switch_sig = phy_read(ioaddr, 0, 2); - if ((lp->switch_sig = phy_read(ioaddr, 0, 2)) == ICPLUS_PHY_ID) { - phy_write(ioaddr, 29,31, 0x175C); /* Enable registers */ + if (lp->switch_sig == ICPLUS_PHY_ID) { + phy_write(ioaddr, 29, 31, 0x175C); /* Enable registers */ lp->phy_mode = 0x8000; } else { /* PHY Mode Check */ @@ -865,24 +644,24 @@ for (i = 0; i < RX_DCNT; i++) { lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0; } /* MAC Bus Control Register */ - outw(MBCR_DEFAULT, ioaddr+0x8); + iowrite16(MBCR_DEFAULT, ioaddr + MBCR); /* MAC TX/RX Enable */ lp->mcr0 |= lp->phy_mode; - outw(lp->mcr0, ioaddr); + iowrite16(lp->mcr0, ioaddr); /* set interrupt waiting time and packet numbers */ - outw(0x0802, ioaddr + 0x0C); - outw(0x0802, ioaddr + 0x10); + iowrite16(0x0F06, ioaddr + MT_ICR); + iowrite16(0x0F06, ioaddr + MR_ICR); - /* upgrade performance (by RDC guys) */ - phy_write(ioaddr, 30, 17, (phy_read(ioaddr, 30, 17) | 0x4000)); //bit 14=1 - phy_write(ioaddr, 30, 17, ~((~phy_read(ioaddr, 30, 17)) | 0x2000)); //bit 13=0 + /* improve performance (by RDC guys) */ + phy_write(ioaddr, 30, 17, (phy_read(ioaddr, 30, 17) | 0x4000)); + phy_write(ioaddr, 30, 17, ~((~phy_read(ioaddr, 30, 17)) | 0x2000)); phy_write(ioaddr, 0, 19, 0x0000); phy_write(ioaddr, 0, 30, 0x01F0); /* Interrupt Mask Register */ - outw(R6040_INT_MASK, ioaddr + 0x40); + iowrite16(INT_MASK, ioaddr + MIER); } /* @@ -892,13 +671,12 @@ for (i = 0; i < RX_DCNT; i++) { static void r6040_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; - struct r6040_private *lp = dev->priv; - u16 ioaddr = dev->base_addr, phy_mode; - - RDC_DBUG("r6040_timer()", 0); + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; + u16 phy_mode; /* Polling PHY Chip Status */ - if (PHY_MODE == 0x3100) + if (PHY_MODE == 0x3100) phy_mode = phy_mode_chk(dev); else phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0; @@ -906,142 +684,412 @@ static void r6040_timer(unsigned long data) if (phy_mode != lp->phy_mode) { lp->phy_mode = phy_mode; lp->mcr0 = (lp->mcr0 & 0x7fff) | phy_mode; - outw(lp->mcr0, ioaddr); - printk(KERN_INFO "Link Change %x \n", inw(ioaddr)); + iowrite16(lp->mcr0, ioaddr); + printk(KERN_INFO "Link Change %x \n", ioread16(ioaddr)); } - /* Debug */ -// printk("<RDC> Timer: CR0 %x CR40 %x CR3C %x\n", inw(ioaddr), inw(ioaddr+0x40), inw(ioaddr+0x3c)); - /* Timer active again */ lp->timer.expires = TIMER_WUT; add_timer(&lp->timer); } -/* Allocate skb buffer for rx descriptor */ -static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev) +/* Read/set MAC address routines */ +static void r6040_mac_address(struct net_device *dev) { - struct r6040_descriptor *descptr; - int ioaddr = dev->base_addr ; + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; + u16 *adrp; - RDC_DBUG("rx_buf_alloc()", 0); + /* MAC operation register */ + iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ + iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ + iowrite16(0, ioaddr + MAC_SM); + udelay(5000); - descptr = lp->rx_insert_ptr; - while (lp->rx_free_desc < RX_DCNT) { - descptr->skb_ptr = dev_alloc_skb(MAX_BUF_SIZE); + /* Restore MAC Address */ + adrp = (u16 *) dev->dev_addr; + iowrite16(adrp[0], ioaddr + MID_0L); + iowrite16(adrp[1], ioaddr + MID_0M); + iowrite16(adrp[2], ioaddr + MID_0H); +} - if (!descptr->skb_ptr) - break; - descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, descptr->skb_ptr->tail, MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); - descptr->status = 0x8000; - descptr = descptr->vndescp; - lp->rx_free_desc++; - outw(lp->mcr0 | 0x0002, ioaddr); /* Trigger Rx DMA */ +static int r6040_open(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + int ret; + + /* Request IRQ and Register interrupt handler */ + ret = request_irq(dev->irq, &r6040_interrupt, + IRQF_SHARED, dev->name, dev); + if (ret) + return ret; + + /* Set MAC address */ + r6040_mac_address(dev); + + /* Allocate Descriptor memory */ + lp->rx_ring = + pci_alloc_consistent(lp->pdev, RX_DESC_SIZE, &lp->rx_ring_dma); + if (!lp->rx_ring) + return -ENOMEM; + + lp->tx_ring = + pci_alloc_consistent(lp->pdev, TX_DESC_SIZE, &lp->tx_ring_dma); + if (!lp->tx_ring) { + pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring, + lp->rx_ring_dma); + return -ENOMEM; } - lp->rx_insert_ptr = descptr; + + r6040_up(dev); + + napi_enable(&lp->napi); + netif_start_queue(dev); + + if (lp->switch_sig != ICPLUS_PHY_ID) { + /* set and active a timer process */ + init_timer(&lp->timer); + lp->timer.expires = TIMER_WUT; + lp->timer.data = (unsigned long)dev; + lp->timer.function = &r6040_timer; + add_timer(&lp->timer); + } + return 0; } -/* Status of PHY CHIP */ -static int phy_mode_chk(struct net_device *dev) +static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct r6040_private *lp = dev->priv; - int ioaddr = dev->base_addr, phy_dat; + struct r6040_private *lp = netdev_priv(dev); + struct r6040_descriptor *descptr; + void __iomem *ioaddr = lp->base; + unsigned long flags; + int ret = NETDEV_TX_OK; - RDC_DBUG("phy_mode_chk()", 0); + /* Critical Section */ + spin_lock_irqsave(&lp->lock, flags); - /* PHY Link Status Check */ - phy_dat = phy_read(ioaddr, lp->phy_addr, 1); - if (!(phy_dat & 0x4)) - return 0x8000; /* Link Failed, full duplex */ + /* TX resource check */ + if (!lp->tx_free_desc) { + spin_unlock_irqrestore(&lp->lock, flags); + netif_stop_queue(dev); + printk(KERN_ERR DRV_NAME ": no tx descriptor\n"); + ret = NETDEV_TX_BUSY; + return ret; + } - /* PHY Chip Auto-Negotiation Status */ - phy_dat = phy_read(ioaddr, lp->phy_addr, 1); - if (phy_dat & 0x0020) { - /* Auto Negotiation Mode */ - phy_dat = phy_read(ioaddr, lp->phy_addr, 5); - phy_dat &= phy_read(ioaddr, lp->phy_addr, 4); - if (phy_dat & 0x140) - phy_dat = 0x8000; - else - phy_dat = 0; - } else { - /* Force Mode */ - phy_dat = phy_read(ioaddr, lp->phy_addr, 0); - if (phy_dat & 0x100) phy_dat = 0x8000; - else phy_dat = 0x0000; + /* Statistic Counter */ + dev->stats.tx_packets++; + dev->stats.tx_bytes += skb->len; + /* Set TX descriptor & Transmit it */ + lp->tx_free_desc--; + descptr = lp->tx_insert_ptr; + if (skb->len < MISR) + descptr->len = MISR; + else + descptr->len = skb->len; + + descptr->skb_ptr = skb; + descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, + skb->data, skb->len, PCI_DMA_TODEVICE)); + descptr->status = 0x8000; + /* Trigger the MAC to check the TX descriptor */ + iowrite16(0x01, ioaddr + MTPR); + lp->tx_insert_ptr = descptr->vndescp; + + /* If no tx resource, stop */ + if (!lp->tx_free_desc) + netif_stop_queue(dev); + + dev->trans_start = jiffies; + spin_unlock_irqrestore(&lp->lock, flags); + return ret; +} + +static void r6040_multicast_list(struct net_device *dev) +{ + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; + u16 *adrp; + u16 reg; + unsigned long flags; + struct dev_mc_list *dmi = dev->mc_list; + int i; + + /* MAC Address */ + adrp = (u16 *)dev->dev_addr; + iowrite16(adrp[0], ioaddr + MID_0L); + iowrite16(adrp[1], ioaddr + MID_0M); + iowrite16(adrp[2], ioaddr + MID_0H); + + /* Promiscous Mode */ + spin_lock_irqsave(&lp->lock, flags); + + /* Clear AMCP & PROM bits */ + reg = ioread16(ioaddr) & ~0x0120; + if (dev->flags & IFF_PROMISC) { + reg |= 0x0020; + lp->mcr0 |= 0x0020; } + /* Too many multicast addresses + * accept all traffic */ + else if ((dev->mc_count > MCAST_MAX) + || (dev->flags & IFF_ALLMULTI)) + reg |= 0x0020; - return phy_dat; -}; + iowrite16(reg, ioaddr); + spin_unlock_irqrestore(&lp->lock, flags); -/* Read a word data from PHY Chip */ -static int phy_read(int ioaddr, int phy_addr, int reg_idx) + /* Build the hash table */ + if (dev->mc_count > MCAST_MAX) { + u16 hash_table[4]; + u32 crc; + + for (i = 0; i < 4; i++) + hash_table[i] = 0; + + for (i = 0; i < dev->mc_count; i++) { + char *addrs = dmi->dmi_addr; + + dmi = dmi->next; + + if (!(*addrs & 1)) + continue; + + crc = ether_crc_le(6, addrs); + crc >>= 26; + hash_table[crc >> 4] |= 1 << (15 - (crc & 0xf)); + } + /* Write the index of the hash table */ + for (i = 0; i < 4; i++) + iowrite16(hash_table[i] << 14, ioaddr + MCR1); + /* Fill the MAC hash tables with their values */ + iowrite16(hash_table[0], ioaddr + MAR0); + iowrite16(hash_table[1], ioaddr + MAR1); + iowrite16(hash_table[2], ioaddr + MAR2); + iowrite16(hash_table[3], ioaddr + MAR3); + } + /* Multicast Address 1~4 case */ + for (i = 0, dmi; (i < dev->mc_count) && (i < MCAST_MAX); i++) { + adrp = (u16 *)dmi->dmi_addr; + iowrite16(adrp[0], ioaddr + MID_1L + 8*i); + iowrite16(adrp[1], ioaddr + MID_1M + 8*i); + iowrite16(adrp[2], ioaddr + MID_1H + 8*i); + dmi = dmi->next; + } + for (i = dev->mc_count; i < MCAST_MAX; i++) { + iowrite16(0xffff, ioaddr + MID_0L + 8*i); + iowrite16(0xffff, ioaddr + MID_0M + 8*i); + iowrite16(0xffff, ioaddr + MID_0H + 8*i); + } +} + +static void netdev_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info) { - int i = 0; + struct r6040_private *rp = netdev_priv(dev); - RDC_DBUG("phy_read()", 0); - outw(0x2000 + reg_idx + (phy_addr << 8), ioaddr + 0x20); - do {} while ((i++ < 2048) && (inw(ioaddr + 0x20) & 0x2000)); + strcpy(info->driver, DRV_NAME); + strcpy(info->version, DRV_VERSION); + strcpy(info->bus_info, pci_name(rp->pdev)); +} - return inw(ioaddr + 0x24); +static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +{ + struct r6040_private *rp = netdev_priv(dev); + int rc; + + spin_lock_irq(&rp->lock); + rc = mii_ethtool_gset(&rp->mii_if, cmd); + spin_unlock_irq(&rp->lock); + + return rc; } -/* Write a word data from PHY Chip */ -static void phy_write(int ioaddr, int phy_addr, int reg_idx, int dat) +static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +{ + struct r6040_private *rp = netdev_priv(dev); + int rc; + + spin_lock_irq(&rp->lock); + rc = mii_ethtool_sset(&rp->mii_if, cmd); + spin_unlock_irq(&rp->lock); + r6040_set_carrier(&rp->mii_if); + + return rc; +} + +static u32 netdev_get_link(struct net_device *dev) { - int i = 0; + struct r6040_private *rp = netdev_priv(dev); - RDC_DBUG("phy_write()", 0); - outw(dat, ioaddr + 0x28); - outw(0x4000 + reg_idx + (phy_addr << 8), ioaddr + 0x20); - do{}while( (i++ < 2048) && (inw(ioaddr + 0x20) & 0x4000) ); + return mii_link_ok(&rp->mii_if); } -enum { - RDC_6040 = 0 +static struct ethtool_ops netdev_ethtool_ops = { + .get_drvinfo = netdev_get_drvinfo, + .get_settings = netdev_get_settings, + .set_settings = netdev_set_settings, + .get_link = netdev_get_link, }; +static int __devinit r6040_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct net_device *dev; + struct r6040_private *lp; + void __iomem *ioaddr; + int err, io_size = R6040_IO_SIZE; + static int card_idx = -1; + int bar = 0; + long pioaddr; + u16 *adrp; + + printk(KERN_INFO "%s\n", version); + + err = pci_enable_device(pdev); + if (err) + return err; + + /* this should always be supported */ + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { + printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses" + "not supported by the card\n"); + return -ENODEV; + } + if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { + printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses" + "not supported by the card\n"); + return -ENODEV; + } + + /* IO Size check */ + if (pci_resource_len(pdev, 0) < io_size) { + printk(KERN_ERR "Insufficient PCI resources, aborting\n"); + return -EIO; + } + + pioaddr = pci_resource_start(pdev, 0); /* IO map base address */ + pci_set_master(pdev); + + dev = alloc_etherdev(sizeof(struct r6040_private)); + if (!dev) { + printk(KERN_ERR "Failed to allocate etherdev\n"); + return -ENOMEM; + } + SET_NETDEV_DEV(dev, &pdev->dev); + lp = netdev_priv(dev); + lp->pdev = pdev; + + if (pci_request_regions(pdev, DRV_NAME)) { + printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n"); + err = -ENODEV; + goto err_out_disable; + } + + ioaddr = pci_iomap(pdev, bar, io_size); + if (!ioaddr) { + printk(KERN_ERR "ioremap failed for device %s\n", + pci_name(pdev)); + return -EIO; + } + + /* Init system & device */ + lp->base = ioaddr; + dev->irq = pdev->irq; + + spin_lock_init(&lp->lock); + pci_set_drvdata(pdev, dev); + + /* Set MAC address */ + card_idx++; + + adrp = (u16 *)dev->dev_addr; + adrp[0] = ioread16(ioaddr + MID_0L); + adrp[1] = ioread16(ioaddr + MID_0M); + adrp[2] = ioread16(ioaddr + MID_0H); + + /* Link new device into r6040_root_dev */ + lp->pdev = pdev; + + /* Init RDC private data */ + lp->mcr0 = 0x1002; + lp->phy_addr = phy_table[card_idx]; + lp->switch_sig = 0; + + /* The RDC-specific entries in the device structure. */ + dev->open = &r6040_open; + dev->hard_start_xmit = &r6040_start_xmit; + dev->stop = &r6040_close; + dev->get_stats = r6040_get_stats; + dev->set_multicast_list = &r6040_multicast_list; + dev->do_ioctl = &r6040_ioctl; + dev->ethtool_ops = &netdev_ethtool_ops; + dev->tx_timeout = &r6040_tx_timeout; + dev->watchdog_timeo = TX_TIMEOUT; +#ifdef CONFIG_NET_POLL_CONTROLLER + dev->poll_controller = r6040_poll_controller; +#endif + netif_napi_add(dev, &lp->napi, r6040_poll, 64); + lp->mii_if.dev = dev; + lp->mii_if.mdio_read = mdio_read; + lp->mii_if.mdio_write = mdio_write; + lp->mii_if.phy_id = lp->phy_addr; + lp->mii_if.phy_id_mask = 0x1f; + lp->mii_if.reg_num_mask = 0x1f; + + /* Register net device. After this dev->name assign */ + err = register_netdev(dev); + if (err) { + printk(KERN_ERR DRV_NAME ": Failed to register net device\n"); + goto err_out_res; + } + return 0; + +err_out_res: + pci_release_regions(pdev); +err_out_disable: + pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); + free_netdev(dev); + + return err; +} + +static void __devexit r6040_remove_one(struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(pdev); + + unregister_netdev(dev); + pci_release_regions(pdev); + free_netdev(dev); + pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); +} + + static struct pci_device_id r6040_pci_tbl[] = { - {PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RDC_6040}, - /*{0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RDC_6040},*/ - {0,} + { PCI_DEVICE(PCI_VENDOR_ID_RDC, 0x6040) }, + { 0 } }; MODULE_DEVICE_TABLE(pci, r6040_pci_tbl); static struct pci_driver r6040_driver = { - .name = "r6040", + .name = DRV_NAME, .id_table = r6040_pci_tbl, .probe = r6040_init_one, .remove = __devexit_p(r6040_remove_one), }; -static int __init r6040_init (void) +static int __init r6040_init(void) { - RDC_DBUG("r6040_init()", 0); - - printk(KERN_INFO "%s\n", version); - printed_version = 1; - - if (parent != NULL) { - struct net_device *the_parent = dev_get_by_name(parent); - - if (the_parent == NULL) { - printk (KERN_ERR DRV_NAME ": Unknown device \"%s\" specified.\n", parent); - return -EINVAL; - } - memcpy((u8 *)&adr_table[0][0], the_parent->dev_addr, 6); - memcpy((u8 *)&adr_table[1][0], the_parent->dev_addr, 6); - ++*(u8 *)&adr_table[0][5]; - } - return pci_register_driver (&r6040_driver); + return pci_register_driver(&r6040_driver); } -static void __exit r6040_cleanup (void) +static void __exit r6040_cleanup(void) { - RDC_DBUG("r6040_cleanup()", 0); - pci_unregister_driver (&r6040_driver); + pci_unregister_driver(&r6040_driver); } module_init(r6040_init); diff --git a/target/linux/rdc/files/include/asm-i386/gpio.h b/target/linux/rdc/files/include/asm-x86/gpio.h index ff87fca0ca..ff87fca0ca 100644 --- a/target/linux/rdc/files/include/asm-i386/gpio.h +++ b/target/linux/rdc/files/include/asm-x86/gpio.h diff --git a/target/linux/rdc/files/include/asm-i386/mach-generic/gpio.h b/target/linux/rdc/files/include/asm-x86/mach-generic/gpio.h index 5305dcb96d..5305dcb96d 100644 --- a/target/linux/rdc/files/include/asm-i386/mach-generic/gpio.h +++ b/target/linux/rdc/files/include/asm-x86/mach-generic/gpio.h diff --git a/target/linux/rdc/files/include/asm-i386/mach-rdc/gpio.h b/target/linux/rdc/files/include/asm-x86/mach-rdc/gpio.h index 2368bd7583..2368bd7583 100644 --- a/target/linux/rdc/files/include/asm-i386/mach-rdc/gpio.h +++ b/target/linux/rdc/files/include/asm-x86/mach-rdc/gpio.h diff --git a/target/linux/rdc/files/include/asm-i386/mach-rdc/rdc321x_defs.h b/target/linux/rdc/files/include/asm-x86/mach-rdc/rdc321x_defs.h index 838ba8f64f..838ba8f64f 100644 --- a/target/linux/rdc/files/include/asm-i386/mach-rdc/rdc321x_defs.h +++ b/target/linux/rdc/files/include/asm-x86/mach-rdc/rdc321x_defs.h diff --git a/target/linux/rdc/patches/001-x86_generic_gpio.patch b/target/linux/rdc/patches/001-x86_generic_gpio.patch index db3d866a1b..ad2102f632 100644 --- a/target/linux/rdc/patches/001-x86_generic_gpio.patch +++ b/target/linux/rdc/patches/001-x86_generic_gpio.patch @@ -1,7 +1,7 @@ -diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 97b64d7..f8c1d32 100644 ---- a/arch/i386/Kconfig -+++ b/arch/i386/Kconfig +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig @@ -79,6 +79,10 @@ config GENERIC_BUG default y depends on BUG diff --git a/target/linux/rdc/patches/004-rdc_fixes.patch b/target/linux/rdc/patches/004-rdc_fixes.patch index 7b87773cf1..47f8c08c68 100644 --- a/target/linux/rdc/patches/004-rdc_fixes.patch +++ b/target/linux/rdc/patches/004-rdc_fixes.patch @@ -1,73 +1,77 @@ -diff -urN linux-2.6.19/arch/i386/Kconfig linux-2.6.19.new/arch/i386/Kconfig ---- linux-2.6.19/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19.new/arch/i386/Kconfig 2006-12-17 17:13:33.000000000 +0100 -@@ -180,6 +180,16 @@ - Only choose this option if you have such a system, otherwise you - should say N here. +diff -urN linux-2.6.24/arch/x86/Kconfig linux-2.6.24.new/arch/x86/Kconfig +--- linux-2.6.24/arch/x86/Kconfig 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24.new/arch/x86/Kconfig 2008-02-11 18:24:27.000000000 +0100 +@@ -300,6 +300,17 @@ + supposed to run on these EM64T-based machines. Only choose this option + if you have one of these machines. +config X86_RDC + bool "Support for RDC 3211 boards" + select GENERIC_GPIO + select LEDS_GPIO ++ select LEDS_CLASS + help -+ Support for RDC 3211 systems. Say 'Y' here if the kernel is -+ supposed to run on an IA-32 RDC R3211 system. -+ Only choose this option if you have such as system, otherwise you -+ should say N here. ++ Support for RDC 3211 systems. Say 'Y' here if the kernel is ++ supposed to run on an IA-32 RDC R3211 system. ++ Only choose this option if you have such as system, otherwise you ++ should say N here. + endchoice - config ACPI_SRAT -diff -urN linux-2.6.19/arch/i386/Makefile linux-2.6.19.new/arch/i386/Makefile ---- linux-2.6.19/arch/i386/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19.new/arch/i386/Makefile 2006-12-17 17:13:33.000000000 +0100 -@@ -92,6 +92,10 @@ - mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000 - mcore-$(CONFIG_X86_ES7000) := mach-default - core-$(CONFIG_X86_ES7000) := arch/i386/mach-es7000/ -+# RDC subarch support -+mflags-$(CONFIG_X86_RDC) := -Iinclude/asm-i386/mach-rdc -+mcore-$(CONFIG_X86_RDC) := mach-default -+core-$(CONFIG_X86_RDC) += arch/i386/mach-rdc/ - - # default subarch .h files - mflags-y += -Iinclude/asm-i386/mach-default ---- timex.h 2007-08-07 10:44:03.816112250 -0700 -+++ linux/include/asm-i386/timex.h 2007-08-07 10:48:47.905866750 -0700 -@@ -11,6 +11,8 @@ + config SCHED_NO_NO_OMIT_FRAME_POINTER +diff -urN linux-2.6.24/arch/x86/kernel/reboot_fixups_32.c linux-2.6.24.new/arch/x86/kernel/reboot_fixups_32.c +--- linux-2.6.24/arch/x86/kernel/reboot_fixups_32.c 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24.new/arch/x86/kernel/reboot_fixups_32.c 2008-02-11 18:26:18.000000000 +0100 +@@ -30,6 +30,17 @@ + udelay(50); /* shouldn't get here but be safe and spin a while */ + } - #ifdef CONFIG_X86_ELAN - # define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */ -+#elif defined(CONFIG_X86_RDC) -+# define CLOCK_TICK_RATE 1041667 /* Underlying HZ for R8610 */ - #else - # define CLOCK_TICK_RATE 1193182 /* Underlying HZ */ - #endif ---- reboot_fixups.c 2007-08-07 12:02:00.908412250 -0700 -+++ linux/arch/i386/kernel/reboot_fixups.c 2007-08-07 12:18:49.391438500 -0700 -@@ -13,6 +13,17 @@ - #include <linux/pci.h> - #include <asm/reboot_fixups.h> - #include <asm/msr.h> -+ +static void r8610_reset(struct pci_dev *dev) +{ -+ int i; ++ int i; + -+ outl(0x80003840,0xCF8); -+ i=inl(0xCFC); -+ i |= 0x1600; -+ outl(i,0xCFC); -+ outb(1,0x92); ++ outl(0x80003840,0xCF8); ++ i=inl(0xCFC); ++ i |= 0x1600; ++ outl(i,0xCFC); ++ outb(1,0x92); +} - - static void cs5530a_warm_reset(struct pci_dev *dev) - { -@@ -40,6 +53,7 @@ - }; - - static struct device_fixup fixups_table[] = { -+{ PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, r8610_reset }, ++ + struct device_fixup { + unsigned int vendor; + unsigned int device; +@@ -40,6 +51,7 @@ { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, + { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, ++{ PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, r8610_reset }, }; + + /* +diff -urN linux-2.6.24/arch/x86/Makefile_32 linux-2.6.24.new/arch/x86/Makefile_32 +--- linux-2.6.24/arch/x86/Makefile_32 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24.new/arch/x86/Makefile_32 2008-02-11 18:25:12.000000000 +0100 +@@ -99,6 +99,11 @@ + mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default + core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/ + ++# RDC subarch support ++mflags-$(CONFIG_X86_RDC) := -Iinclude/asm-x86/mach-rdc ++mcore-$(CONFIG_X86_RDC) := arch/x86/mach-default ++core-$(CONFIG_X86_RDC) += arch/x86/mach-rdc/ ++ + # Xen paravirtualization support + core-$(CONFIG_XEN) += arch/x86/xen/ + +diff -urN linux-2.6.24/include/asm-x86/timex.h linux-2.6.24.new/include/asm-x86/timex.h +--- linux-2.6.24/include/asm-x86/timex.h 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24.new/include/asm-x86/timex.h 2008-02-11 18:25:43.000000000 +0100 +@@ -7,6 +7,8 @@ + + #ifdef CONFIG_X86_ELAN + # define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */ ++#elif defined(CONFIG_X86_RDC) ++# define PIT_TICK_RATE 1041667 /* Underlying HZ for R8610 */ + #else + # define PIT_TICK_RATE 1193182 /* Underlying HZ */ + #endif diff --git a/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch b/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch deleted file mode 100644 index 9e0eefb09e..0000000000 --- a/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN linux-2.6.22.1/arch/i386/kernel/cpu/Makefile linux-2.6.22.1.new/arch/i386/kernel/cpu/Makefile ---- linux-2.6.22.1/arch/i386/kernel/cpu/Makefile 2007-08-11 22:16:24.000000000 +0200 -+++ linux-2.6.22.1.new/arch/i386/kernel/cpu/Makefile 2007-08-13 16:37:32.000000000 +0200 -@@ -12,6 +12,7 @@ - obj-y += rise.o - obj-y += nexgen.o - obj-y += umc.o -+obj-$(CONFIG_X86_RDC) += rdc.o - - obj-$(CONFIG_X86_MCE) += mcheck/ - -diff -urN linux-2.6.22.1/arch/i386/kernel/cpu/Makefile linux-2.6.22.1.new/arch/i386/kernel/cpu/Makefile ---- linux-2.6.22.1/include/asm-i386/processor.h 2007-08-13 16:42:25.000000000 +0200 -+++ linux-2.6.22.1.new/include/asm-i386/processor.h 2007-08-13 16:51:19.000000000 +0200 -@@ -92,6 +92,7 @@ - #define X86_VENDOR_TRANSMETA 7 - #define X86_VENDOR_NSC 8 - #define X86_VENDOR_NUM 9 -+#define X86_VENDOR_RDC 0xff - #define X86_VENDOR_UNKNOWN 0xff - - /* diff --git a/target/linux/rdc/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch index bb10f1fdcc..292ec88ff6 100644 --- a/target/linux/rdc/patches/600-x86_lzma.patch +++ b/target/linux/rdc/patches/600-x86_lzma.patch @@ -1,6 +1,6 @@ -diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.c linux-lzma/arch/i386/boot/compressed/LzmaDecode.c ---- linux-old/arch/i386/boot/compressed/LzmaDecode.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-lzma/arch/i386/boot/compressed/LzmaDecode.c 2005-06-05 00:07:38.000000000 -0400 +diff -Naur linux-old/arch/x86/boot/compressed/LzmaDecode.c linux-lzma/arch/i386/boot/compressed/LzmaDecode.c +--- linux-old/arch/x86/boot/compressed/LzmaDecode.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-lzma/arch/x86/boot/compressed/LzmaDecode.c 2005-06-05 00:07:38.000000000 -0400 @@ -0,0 +1,586 @@ +/* + LzmaDecode.c @@ -588,9 +588,9 @@ diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.c linux-lzma/arch/i386 + *outSizeProcessed = nowPos; + return LZMA_RESULT_OK; +} -diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.h linux-lzma/arch/i386/boot/compressed/LzmaDecode.h ---- linux-old/arch/i386/boot/compressed/LzmaDecode.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-lzma/arch/i386/boot/compressed/LzmaDecode.h 2005-06-05 00:07:39.000000000 -0400 +diff -Naur linux-old/arch/x86/boot/compressed/LzmaDecode.h linux-lzma/arch/i386/boot/compressed/LzmaDecode.h +--- linux-old/arch/x86/boot/compressed/LzmaDecode.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-lzma/arch/x86/boot/compressed/LzmaDecode.h 2005-06-05 00:07:39.000000000 -0400 @@ -0,0 +1,100 @@ +/* + LzmaDecode.h @@ -692,9 +692,9 @@ diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.h linux-lzma/arch/i386 + UInt32 *outSizeProcessed); + +#endif -diff -Naur linux-old/arch/i386/boot/compressed/lzma_misc.c linux-lzma/arch/i386/boot/compressed/lzma_misc.c ---- linux-old/arch/i386/boot/compressed/lzma_misc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-lzma/arch/i386/boot/compressed/lzma_misc.c 2005-06-04 21:33:48.000000000 -0400 +diff -Naur linux-old/arch/x86/boot/compressed/lzma_misc.c linux-lzma/arch/i386/boot/compressed/lzma_misc.c +--- linux-old/arch/x86/boot/compressed/lzma_misc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-lzma/arch/x86/boot/compressed/lzma_misc.c 2005-06-04 21:33:48.000000000 -0400 @@ -0,0 +1,281 @@ +/* + * lzma_misc.c @@ -977,24 +977,48 @@ diff -Naur linux-old/arch/i386/boot/compressed/lzma_misc.c linux-lzma/arch/i386/ + lzma_unzip(); + return; +} -diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boot/compressed/Makefile ---- linux-old/arch/i386/boot/compressed/Makefile 2005-06-04 21:53:40.000000000 -0400 -+++ linux-lzma/arch/i386/boot/compressed/Makefile 2005-06-05 00:25:23.000000000 -0400 -@@ -4,7 +4,7 @@ +diff -urN linux-2.6.19.2/scripts/Makefile.lib linux-2.6.19.2.new/scripts/Makefile.lib +--- linux-2.6.19.2/scripts/Makefile.lib 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.new/scripts/Makefile.lib 2007-04-15 23:51:54.000000000 +0200 +@@ -162,4 +162,9 @@ + quiet_cmd_gzip = GZIP $@ + cmd_gzip = gzip -f -9 < $< > $@ + +- ++# LZMA ++# ++quiet_cmd_lzma = LZMA $@ ++cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0 ++# to use lzmacomp, ++# cmd_lzma = lzmacomp $< 700 > $@ +diff -u linux/scripts/lzma_kern linux/scripts/lzma_kern +--- linux/scripts/lzma_kern 2007-07-27 20:18:17.013014750 -0700 ++++ linux/scripts/lzma_kern 2007-07-27 20:18:17.013014750 -0700 +@@ -0,0 +1,4 @@ ++get-size() { echo "$5" ;} ++printf -v len '%.8x' "$(get-size $(ls -l "$1"))" ++lzma e "$@" ++echo -ne "\x$(echo $len | cut -c 7,8)\x$(echo $len | cut -c 5,6)\x$(echo $len | cut -c 3,4)\x$(echo $len | cut -c 1,2)" >> "$2" +diff -urN linux-2.6.24/arch/x86/boot/compressed/Makefile_32 linux-2.6.24.new/arch/x86/boot/compressed/Makefile_32 +--- linux-2.6.24/arch/x86/boot/compressed/Makefile_32 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24.new/arch/x86/boot/compressed/Makefile_32 2008-02-13 15:21:03.000000000 +0100 +@@ -4,8 +4,8 @@ # create a compressed vmlinux image from the original vmlinux # --targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o \ -+targets := vmlinux vmlinux.bin vmlinux.bin.lzma head.o lzma_misc.o piggy.o \ - vmlinux.bin.all vmlinux.relocs +-targets := vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \ +- vmlinux.bin.all vmlinux.relocs ++targets := vmlinux vmlinux.bin vmlinux.bin.lzma head_32.o piggy.o \ ++ vmlinux.bin.all vmlinux.relocs lzma_misc.o EXTRA_AFLAGS := -traditional + LDFLAGS_vmlinux := -T @@ -17,7 +17,7 @@ $(call cc-option,-fno-stack-protector) LDFLAGS := -m elf_i386 --$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE -+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE +-$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE ++$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE $(call if_changed,ld) @: @@ -1015,28 +1039,6 @@ diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boo LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T --$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE -+$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.lzma FORCE +-$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE ++$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.lzma FORCE $(call if_changed,ld) -diff -urN linux-2.6.19.2/scripts/Makefile.lib linux-2.6.19.2.new/scripts/Makefile.lib ---- linux-2.6.19.2/scripts/Makefile.lib 2007-01-10 20:10:37.000000000 +0100 -+++ linux-2.6.19.2.new/scripts/Makefile.lib 2007-04-15 23:51:54.000000000 +0200 -@@ -162,4 +162,9 @@ - quiet_cmd_gzip = GZIP $@ - cmd_gzip = gzip -f -9 < $< > $@ - -- -+# LZMA -+# -+quiet_cmd_lzma = LZMA $@ -+cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0 -+# to use lzmacomp, -+# cmd_lzma = lzmacomp $< 700 > $@ -diff -u linux/scripts/lzma_kern linux/scripts/lzma_kern ---- linux/scripts/lzma_kern 2007-07-27 20:18:17.013014750 -0700 -+++ linux/scripts/lzma_kern 2007-07-27 20:18:17.013014750 -0700 -@@ -0,0 +1,4 @@ -+get-size() { echo "$5" ;} -+printf -v len '%.8x' "$(get-size $(ls -l "$1"))" -+lzma e "$@" -+echo -ne "\x$(echo $len | cut -c 7,8)\x$(echo $len | cut -c 5,6)\x$(echo $len | cut -c 3,4)\x$(echo $len | cut -c 1,2)" >> "$2" |