Changeset 18323

Timestamp:

01/26/12 15:49:23 (17 months ago)

Author:

BrainSlayer

Message:

Update configs and configure imq queues depending on the cpu core count

Location:

src/linux/universal/linux-3.2

Files:

• .config_laguna (modified) (3 diffs)
• .config_laguna_nosmp (modified) (3 diffs)
• arch/arm/mach-cns3xxx/laguna.c (modified) (2 diffs)
• arch/arm/mach-cns3xxx/platsmp.c (modified) (2 diffs)
• drivers/net/imq.c (modified) (2 diffs)

src/linux/universal/linux-3.2/.config_laguna

@@ -1671 +1671 @@
 # CONFIG_HID_SUPPORT is not set
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1717 +1717 @@
 # CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_MUSB_HDRC is not set
-CONFIG_USB_DWC_OTG=y
+CONFIG_USB_DWC_OTG=m
 # CONFIG_DWC_DEBUG is not set
 # CONFIG_DWC_HOST_ONLY is not set
@@ -1849 +1849 @@
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_CI13XXX_PCI is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_LANGWELL is not set
+# CONFIG_USB_EG20T is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_ETH is not set

src/linux/universal/linux-3.2/.config_laguna_nosmp

@@ -1659 +1659 @@
 # CONFIG_HID_SUPPORT is not set
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1705 +1705 @@
 # CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_MUSB_HDRC is not set
-CONFIG_USB_DWC_OTG=y
+CONFIG_USB_DWC_OTG=m
 # CONFIG_DWC_DEBUG is not set
 # CONFIG_DWC_HOST_ONLY is not set
@@ -1837 +1837 @@
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_CI13XXX_PCI is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_LANGWELL is not set
+# CONFIG_USB_EG20T is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_ETH is not set

src/linux/universal/linux-3.2/arch/arm/mach-cns3xxx/laguna.c

@@ -36 +36 @@
 #include <linux/if_ether.h>
 #include <linux/export.h>
+#include <linux/module.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -53 +54 @@
 #include "core.h"
 #include "devices.h"
+
+unsigned int numcpucores=1;
+EXPORT_SYMBOL(numcpucores);
 
 // Config 1 Bitmap

src/linux/universal/linux-3.2/arch/arm/mach-cns3xxx/platsmp.c

@@ -142 +142 @@
         spin_unlock(&boot_lock);
 }
+extern unsigned int numcpucores;
 
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
@@ -173 +174 @@
                 smp_rmb();
                 if (pen_release == -1)
+                {
+                        numcpucores++;
                         break;
+                }
 
                 udelay(10);

src/linux/universal/linux-3.2/drivers/net/imq.c

@@ -774 +774 @@
         return err;
 }
-
+#ifdef CONFIG_ARCH_CNS3XXX
+extern unsigned int numcpucores;
+#endif
 static int __init imq_init_module(void)
 {
         int err;
+unsigned int numcpucores=1;
 
 #if defined(CONFIG_IMQ_NUM_DEVS)
@@ -784 +787 @@
         BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK);
 #endif
-
+#ifdef CONFIG_ARCH_CNS3XXX
+        numqueues = numcpucores;
+#endif
         err = imq_init_devs();
         if (err) {