diff options
Diffstat (limited to 'target/linux/ixp4xx/patches/100-npe_driver.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches/100-npe_driver.patch | 155 |
1 files changed, 76 insertions, 79 deletions
diff --git a/target/linux/ixp4xx/patches/100-npe_driver.patch b/target/linux/ixp4xx/patches/100-npe_driver.patch index 78fb119bc..987e34982 100644 --- a/target/linux/ixp4xx/patches/100-npe_driver.patch +++ b/target/linux/ixp4xx/patches/100-npe_driver.patch @@ -1,10 +1,7 @@ -diff --git a/Documentation/networking/ixp4xx/IxNpeMicrocode.h b/Documentation/networking/ixp4xx/IxNpeMicrocode.h -new file mode 100644 -index 0000000..e5a4bd3 -Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h +Index: linux-2.6.21.7/Documentation/networking/ixp4xx/IxNpeMicrocode.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/Documentation/networking/ixp4xx/IxNpeMicrocode.h @@ -0,0 +1,143 @@ +/* + * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file @@ -149,10 +146,10 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/IxNpeMicrocode.h + close(fd); + return 0; +} -Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README +Index: linux-2.6.21.7/Documentation/networking/ixp4xx/README =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/Documentation/networking/ixp4xx/README @@ -0,0 +1,62 @@ +Informations about the Networking Driver using the IXP4XX CPU internal NPEs +and Queue manager. @@ -216,10 +213,10 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/README + to grab the microcode from a binary image like the RedBoot bootloader. + + -Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c +Index: linux-2.6.21.7/Documentation/networking/ixp4xx/mc_grab.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/Documentation/networking/ixp4xx/mc_grab.c @@ -0,0 +1,97 @@ +/* + * mc_grab.c - grabs IXP4XX microcode from a binary datastream @@ -318,11 +315,11 @@ Index: linux-2.6.21-rc1-arm/Documentation/networking/ixp4xx/mc_grab.c + fprintf(stderr, "Error reading Microcode\n"); + return ret; +} -Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c =================================================================== ---- linux-2.6.21-rc1-arm.orig/arch/arm/mach-ixp4xx/common.c 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c 2007-02-21 02:24:35.000000000 -0800 -@@ -357,6 +357,90 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/common.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/common.c +@@ -357,6 +357,90 @@ static struct platform_device *ixp46x_de &ixp46x_i2c_controller }; @@ -413,7 +410,7 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c unsigned long ixp4xx_exp_bus_size; EXPORT_SYMBOL(ixp4xx_exp_bus_size); -@@ -378,8 +462,19 @@ +@@ -378,8 +462,19 @@ void __init ixp4xx_sys_init(void) break; } } @@ -433,11 +430,11 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/common.c printk("IXP4xx: Using %luMiB expansion bus window size\n", ixp4xx_exp_bus_size >> 20); } -Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c +Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-setup.c =================================================================== ---- linux-2.6.21-rc1-arm.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-02-21 02:24:35.000000000 -0800 -@@ -101,10 +101,59 @@ +--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c ++++ linux-2.6.21.7/arch/arm/mach-ixp4xx/ixdp425-setup.c +@@ -101,10 +101,59 @@ static struct platform_device ixdp425_ua .resource = ixdp425_uart_resources }; @@ -498,11 +495,11 @@ Index: linux-2.6.21-rc1-arm/arch/arm/mach-ixp4xx/ixdp425-setup.c }; static void __init ixdp425_init(void) -Index: linux-2.6.21-rc1-arm/drivers/net/Kconfig +Index: linux-2.6.21.7/drivers/net/Kconfig =================================================================== ---- linux-2.6.21-rc1-arm.orig/drivers/net/Kconfig 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/drivers/net/Kconfig 2007-02-21 02:24:35.000000000 -0800 -@@ -201,6 +201,8 @@ +--- linux-2.6.21.7.orig/drivers/net/Kconfig ++++ linux-2.6.21.7/drivers/net/Kconfig +@@ -324,6 +324,8 @@ config MACB source "drivers/net/arm/Kconfig" @@ -511,11 +508,11 @@ Index: linux-2.6.21-rc1-arm/drivers/net/Kconfig config MACE tristate "MACE (Power Mac ethernet) support" depends on NET_ETHERNET && PPC_PMAC && PPC32 -Index: linux-2.6.21-rc1-arm/drivers/net/Makefile +Index: linux-2.6.21.7/drivers/net/Makefile =================================================================== ---- linux-2.6.21-rc1-arm.orig/drivers/net/Makefile 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/drivers/net/Makefile 2007-02-21 02:24:35.000000000 -0800 -@@ -212,6 +212,7 @@ +--- linux-2.6.21.7.orig/drivers/net/Makefile ++++ linux-2.6.21.7/drivers/net/Makefile +@@ -213,6 +213,7 @@ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_ETRAX_ETHERNET) += cris/ obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/ @@ -523,10 +520,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/Makefile obj-$(CONFIG_NETCONSOLE) += netconsole.o -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig +Index: linux-2.6.21.7/drivers/net/ixp4xx/Kconfig =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/Kconfig @@ -0,0 +1,48 @@ +config IXP4XX_QMGR + tristate "IXP4xx Queue Manager support" @@ -576,10 +573,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Kconfig + help + This driver is a generic NPE-crypto access layer. + You need additional code in OCF for example. -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile +Index: linux-2.6.21.7/drivers/net/ixp4xx/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/Makefile @@ -0,0 +1,7 @@ +obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o +obj-$(CONFIG_IXP4XX_NPE) += ixp4xx_npe.o @@ -588,10 +585,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/Makefile + +ixp4xx_npe-objs := ucode_dl.o npe_mh.o npe.o +ixp4xx_mac-objs := mac_driver.o phy.o -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_crypto.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_crypto.c @@ -0,0 +1,851 @@ +/* + * ixp4xx_crypto.c - interface to the HW crypto @@ -1444,10 +1441,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_crypto.c +module_init(init_crypto); +module_exit(finish_crypto); + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_qmgr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/ixp4xx_qmgr.c @@ -0,0 +1,474 @@ +/* + * qmgr.c - reimplementation of the queue configuration interface. @@ -1923,10 +1920,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ixp4xx_qmgr.c +EXPORT_SYMBOL(queue_set_irq_src); +EXPORT_SYMBOL(queue_set_watermarks); +EXPORT_SYMBOL(queue_len); -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h +Index: linux-2.6.21.7/drivers/net/ixp4xx/mac.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/mac.h @@ -0,0 +1,275 @@ +/* + * Copyright (C) 2002-2006 Christian Hohnstaedt <chohnstaedt@innominate.com> @@ -2203,10 +2200,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac.h + {"RxInternalNPEReceiveErrors "}, \ + {"TxInternalNPETransmitErrors "} + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c 2007-02-21 02:24:46.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/mac_driver.c @@ -0,0 +1,850 @@ +/* + * mac_driver.c - provide a network interface for each MAC @@ -3058,10 +3055,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/mac_driver.c +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Christian Hohnstaedt <chohnstaedt@innominate.com>"); + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/npe.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/npe.c @@ -0,0 +1,291 @@ + +#include <linux/ixp_npe.h> @@ -3354,10 +3351,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe.c +EXPORT_SYMBOL(npe_stop); +EXPORT_SYMBOL(npe_start); +EXPORT_SYMBOL(npe_reset); -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/npe_mh.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/npe_mh.c @@ -0,0 +1,170 @@ +/* + * npe_mh.c - NPE message handler. @@ -3529,10 +3526,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/npe_mh.c +EXPORT_SYMBOL(npe_mh_set_rxqid); +EXPORT_SYMBOL(npe_mh_npe_loopback_mode); +EXPORT_SYMBOL(npe_mh_get_stats); -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/phy.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/phy.c @@ -0,0 +1,113 @@ +/* + * phy.c - MDIO functions and mii initialisation @@ -3647,10 +3644,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/phy.c + mac->mii.mdio_write = mdio_write_register; +} + -Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c +Index: linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/drivers/net/ixp4xx/ucode_dl.c @@ -0,0 +1,479 @@ +/* + * ucode_dl.c - provide an NPE device and a char-dev for microcode download @@ -4131,10 +4128,10 @@ Index: linux-2.6.21-rc1-arm/drivers/net/ixp4xx/ucode_dl.c + +EXPORT_SYMBOL(get_npe_by_id); +EXPORT_SYMBOL(return_npe_dev); -Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h =================================================================== ---- linux-2.6.21-rc1-arm.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2007-02-21 02:24:35.000000000 -0800 +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h @@ -22,6 +22,8 @@ #ifndef _ASM_ARM_IXP4XX_H_ #define _ASM_ARM_IXP4XX_H_ @@ -4220,7 +4217,7 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h #ifndef __ASSEMBLY__ static inline int cpu_is_ixp46x(void) { -@@ -620,6 +668,15 @@ +@@ -620,6 +668,15 @@ static inline int cpu_is_ixp46x(void) #endif return 0; } @@ -4236,10 +4233,10 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h #endif #endif -Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/npe_regs.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/npe_regs.h @@ -0,0 +1,82 @@ +#ifndef NPE_REGS_H +#define NPE_REGS_H @@ -4323,11 +4320,11 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/npe_regs.h + +#endif + -Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h +Index: linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h =================================================================== ---- linux-2.6.21-rc1-arm.orig/include/asm-arm/arch-ixp4xx/platform.h 2007-02-21 02:24:18.000000000 -0800 -+++ linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h 2007-02-21 02:24:35.000000000 -0800 -@@ -86,6 +86,25 @@ +--- linux-2.6.21.7.orig/include/asm-arm/arch-ixp4xx/platform.h ++++ linux-2.6.21.7/include/asm-arm/arch-ixp4xx/platform.h +@@ -86,6 +86,25 @@ struct ixp4xx_i2c_pins { unsigned long scl_pin; }; @@ -4353,10 +4350,10 @@ Index: linux-2.6.21-rc1-arm/include/asm-arm/arch-ixp4xx/platform.h /* * This structure provide a means for the board setup code * to give information to th pata_ixp4xx driver. It is -Index: linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h +Index: linux-2.6.21.7/include/linux/ixp_crypto.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/ixp_crypto.h @@ -0,0 +1,192 @@ + +#ifndef IX_CRYPTO_H @@ -4550,10 +4547,10 @@ Index: linux-2.6.21-rc1-arm/include/linux/ixp_crypto.h + const struct ix_hash_algo *auth, int len); + +#endif -Index: linux-2.6.21-rc1-arm/include/linux/ixp_npe.h +Index: linux-2.6.21.7/include/linux/ixp_npe.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/ixp_npe.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/ixp_npe.h @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com> @@ -4672,10 +4669,10 @@ Index: linux-2.6.21-rc1-arm/include/linux/ixp_npe.h +npe_mh_get_stats(struct npe_info *npe, struct mac_plat_info *mp, u32 phys, int reset); + +#endif -Index: linux-2.6.21-rc1-arm/include/linux/ixp_qmgr.h +Index: linux-2.6.21.7/include/linux/ixp_qmgr.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21-rc1-arm/include/linux/ixp_qmgr.h 2007-02-21 02:24:35.000000000 -0800 +--- /dev/null ++++ linux-2.6.21.7/include/linux/ixp_qmgr.h @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com> |