From a2d7db8f55ea6be119a7ff9be71e6341e76dd618 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 10 Jan 2006 09:37:32 +0000 Subject: ixp-osal, ixp4xx-csr: gcc4 patches in 2.1 --- packages/ixp4xx/ixp-osal-2.1/Makefile.patch | 2 +- packages/ixp4xx/ixp-osal_2.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch | 2 +- packages/ixp4xx/ixp4xx-csr-2.1/gcc4.patch | 23 +++++++++++++++++++++++ packages/ixp4xx/ixp4xx-csr_2.1.bb | 3 ++- 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 packages/ixp4xx/ixp4xx-csr-2.1/gcc4.patch (limited to 'packages') diff --git a/packages/ixp4xx/ixp-osal-2.1/Makefile.patch b/packages/ixp4xx/ixp-osal-2.1/Makefile.patch index d687ebc070..1558e9cdb3 100644 --- a/packages/ixp4xx/ixp-osal-2.1/Makefile.patch +++ b/packages/ixp4xx/ixp-osal-2.1/Makefile.patch @@ -24,7 +24,7 @@ CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common \ - -pipe -mapcs-32 -mshort-load-bytes -msoft-float -DMODULE \ -+ -pipe -mapcs-32 -msoft-float -DMODULE \ ++ -pipe -msoft-float -DMODULE \ -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) -DEXPORT_SYMTAB # Linux linker flags diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index ce9acce4e7..f8bd4cb7a1 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -31,7 +31,7 @@ SRC_URI += "file://le.patch;patch=1" SRC_URI += "file://assert.patch;patch=1" S = "${WORKDIR}/ixp_osal" -PR = "r1" +PR = "r2" COMPATIBLE_HOST = "^arm.*-linux.*" diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch b/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch index 11a9db4373..f082b713f0 100644 --- a/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch +++ b/packages/ixp4xx/ixp4xx-csr-2.1/Makefile.patch @@ -8,7 +8,7 @@ +LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mtune=xscale -CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -mshort-load-bytes -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) -+CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) ++CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) ifndef IX_INCLUDE_MICROCODE CFLAGS += -DIX_NPEDL_READ_MICROCODE_FROM_FILE endif diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/gcc4.patch b/packages/ixp4xx/ixp4xx-csr-2.1/gcc4.patch new file mode 100644 index 0000000000..a701328dd1 --- /dev/null +++ b/packages/ixp4xx/ixp4xx-csr-2.1/gcc4.patch @@ -0,0 +1,23 @@ +--- ixp400/src/npeMh/IxNpeMhSymbols.c~ 2006-01-08 03:13:28.000000000 +1030 ++++ ixp400/src/npeMh/IxNpeMhSymbols.c 2006-01-09 00:56:57.000000000 +1030 +@@ -52,6 +52,7 @@ + + #include + #include ++#include + + EXPORT_SYMBOL(ixNpeMhInitialize); + EXPORT_SYMBOL(ixNpeMhUnload); +@@ -67,9 +68,9 @@ extern BOOL ixNpeMhConfigInFifoIsFull(Ix + extern BOOL ixNpeMhConfigOutFifoIsEmpty (IxNpeMhNpeId npeId); + extern void ixNpeMhConfigLockRelease (IxNpeMhNpeId npeId); + extern void ixNpeMhConfigLockGet (IxNpeMhNpeId npeId); +-extern void ixNpeMhConfigOutFifoRead (IxNpeMhNpeId npeId,IxNpeMhMessage *message); +-extern void ixNpeMhConfigInFifoWrite (IxNpeMhNpeId npeId,IxNpeMhMessage message); +-extern struct ixNpeMhConfigNpeInfo ixNpeMhConfigNpeInfo[IX_NPEMH_NUM_NPES]; ++extern IX_STATUS ixNpeMhConfigOutFifoRead (IxNpeMhNpeId npeId,IxNpeMhMessage *message); ++extern IX_STATUS ixNpeMhConfigInFifoWrite (IxNpeMhNpeId npeId,IxNpeMhMessage message); ++extern IxNpeMhConfigNpeInfo ixNpeMhConfigNpeInfo[IX_NPEMH_NUM_NPES]; + + EXPORT_SYMBOL(ixNpeMhConfigInFifoIsFull); + EXPORT_SYMBOL(ixNpeMhConfigOutFifoIsEmpty); diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 76ef0c09da..9db50cef2b 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -33,11 +33,12 @@ SRC_URI += "file://ixnpemhconfigisr-is-private.patch;patch=1" SRC_URI += "file://le.patch;patch=1" SRC_URI += "file://mii-debug.patch;patch=1" SRC_URI += "file://rtl8201-support.patch;patch=1" +SRC_URI += "file://gcc4.patch;patch=1" SRC_URI += "file://oe-makefile.patch;patch=1" DEPENDS = "ixp-osal" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r6" +PR = "r7" COMPATIBLE_HOST = "^arm.*-linux.*" -- cgit v1.2.3 From dbb8037b26b34df48e7799908a2a47c6cd6e4e8a Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 10 Jan 2006 09:38:16 +0000 Subject: ixp400-eth: gcc4 patch in 1.5 --- .../ixp400-eth-1.5/netdev_max_backlog.patch | 54 ++++++++++++++++++++++ packages/ixp425-eth/ixp400-eth_1.5.bb | 3 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 packages/ixp425-eth/ixp400-eth-1.5/netdev_max_backlog.patch (limited to 'packages') diff --git a/packages/ixp425-eth/ixp400-eth-1.5/netdev_max_backlog.patch b/packages/ixp425-eth/ixp400-eth-1.5/netdev_max_backlog.patch new file mode 100644 index 0000000000..6891b6b4a9 --- /dev/null +++ b/packages/ixp425-eth/ixp400-eth-1.5/netdev_max_backlog.patch @@ -0,0 +1,54 @@ +--- ixp400_eth/ixp400_eth.c~ 2006-01-09 01:03:11.000000000 +1030 ++++ ixp400_eth/ixp400_eth.c 2006-01-09 01:05:27.000000000 +1030 +@@ -139,12 +139,12 @@ + * skbuf to push into the linux stack, and avoid the performance degradations + * during overflow. + */ +-static int netdev_max_backlog = 290; ++static int ixp400_netdev_max_backlog = 290; + + static int datapath_poll = 1; /* default : rx/tx polling, not interrupt driven*/ + +-MODULE_PARM(netdev_max_backlog, "i"); +-MODULE_PARM_DESC(netdev_max_backlog, "Should be set to the value of /proc/sys/net/core/netdev_max_backlog (perf affecting)"); ++MODULE_PARM(ixp400_netdev_max_backlog, "i"); ++MODULE_PARM_DESC(ixp400_netdev_max_backlog, "Should be set to the value of /proc/sys/net/core/netdev_max_backlog (perf affecting)"); + MODULE_PARM(datapath_poll, "i"); + MODULE_PARM_DESC(datapath_poll, "If non-zero, use polling method for datapath instead of interrupts"); + #endif /* CONFIG_IXP400_NAPI */ +@@ -213,7 +213,7 @@ + * high traffic rates. To measure the maximum throughput between the + * ports of the driver, + * - Modify /proc/sys/net/core/netdev_max_backlog value in the kernel +- * - Adjust netdev_max_backlog=n in the driver's command line ++ * - Adjust ixp400_netdev_max_backlog=n in the driver's command line + * in order to get the best rates depending on the testing tool + * and the OS load. + * +@@ -1997,7 +1997,7 @@ + /* check if the system accepts more traffic and + * against chained mbufs + */ +- if ((qlevel < netdev_max_backlog) ++ if ((qlevel < ixp400_netdev_max_backlog) + && (IX_OSAL_MBUF_NEXT_PKT_IN_CHAIN_PTR(mbuf) == NULL)) + #else + /* check against chained mbufs +@@ -3776,13 +3776,13 @@ + #ifndef CONFIG_IXP400_NAPI + /* set the softirq rx queue thresholds + * (These numbers are based on tuning experiments) +- * maxbacklog = (netdev_max_backlog * 10) / 63; ++ * maxbacklog = (ixp400_netdev_max_backlog * 10) / 63; + */ +- if (netdev_max_backlog == 0) ++ if (ixp400_netdev_max_backlog == 0) + { +- netdev_max_backlog = 290; /* system default */ ++ ixp400_netdev_max_backlog = 290; /* system default */ + } +- netdev_max_backlog /= BACKLOG_TUNE; ++ ixp400_netdev_max_backlog /= BACKLOG_TUNE; + + TRACE; + #endif diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index 96287fb3d9..f5d2b34070 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -15,10 +15,11 @@ SRC_URI += "file://mac-address.patch;patch=1" SRC_URI += "file://int-random.patch;patch=1" SRC_URI += "file://stop-on-rmmod.patch;patch=1" SRC_URI += "file://continue-if-qmgr-init-fails.patch;patch=1" +SRC_URI += "file://netdev_max_backlog.patch;patch=1" SRC_URI += "file://debug.patch;patch=1" SRC_URI += "file://Makefile.patch;patch=1" -PR = "r2" +PR = "r3" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" -- cgit v1.2.3