Changeset 4744

Timestamp:

11/03/08 02:48:41 (5 years ago)

Author:

werner

Message:

More cleanup and a little priority boost for the io task.

• moved hif-direct-interrupt.patch and hack-dont-poll-irq.patch to the attic as well
• gta02-mmc-spi-bitbang.patch, last of the SPI drivers, to the attic
• gta02-mmc-mci.patch: since S3C MCI is now the only SDIO low-level driver, we don't have to be able to select it by configuration
• arch/arm/mach-s3c2440/mach-gta02.c: remove obsolete gta02_mmc_cfg, remove the experimental registration of s3c_device_sdi, and re-enable s3c_device_sdi in the list of platform devices
• drivers/ar6000/hif/hif2.c: boost priority of io task to one level below ksdioirqd

Location:

developers/werner/wlan-spi/patches-tracking

Files:

• attic/gta02-mmc-spi-bitbang.patch (moved) (moved from developers/werner/wlan-spi/patches-tracking/gta02-mmc-spi-bitbang.patch)
• attic/hack-dont-poll-irq.patch (moved) (moved from developers/werner/wlan-spi/patches-tracking/hack-dont-poll-irq.patch)
• attic/hif-direct-interrupt.patch (moved) (moved from developers/werner/wlan-spi/patches-tracking/hif-direct-interrupt.patch)
• gta02-mmc-mci.patch (modified) (1 diff)
• hif-linux-sdio.patch (modified) (4 diffs)
• series (modified) (2 diffs)

developers/werner/wlan-spi/patches-tracking/gta02-mmc-mci.patch

@@ -1 +1 @@
 Use S3C SDI on GTA02.
 
-Index: ktrack/arch/arm/mach-s3c2440/Kconfig
-===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/Kconfig   2008-11-02 11:04:06.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/Kconfig        2008-11-02 11:04:06.000000000 -0200
-@@ -113,6 +113,11 @@
-                 bool "GPIO bit-banging SPI"
-                 select MMC_SPI
-                 select SPI_S3C24XX_GPIO
-+
-+       config AR6K_S3CMCI
-+               bool "S3C MMC/SD/SDIO driver"
-+               select MMC_S3C
-+
- endchoice
- 
- endmenu
 Index: ktrack/arch/arm/mach-s3c2440/mach-gta02.c
 ===================================================================
---- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-11-02 11:04:06.000000000 -0200
-+++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-11-02 11:04:06.000000000 -0200
-@@ -1720,6 +1720,11 @@
-        platform_device_register(&gta02_spi_wlan);
- #endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */
+--- ktrack.orig/arch/arm/mach-s3c2440/mach-gta02.c      2008-11-02 22:49:21.000000000 -0200
++++ ktrack/arch/arm/mach-s3c2440/mach-gta02.c   2008-11-02 22:53:59.000000000 -0200
+@@ -902,12 +902,6 @@
+        .software_ecc   = 1,
+ };
  
-+#ifdef CONFIG_AR6K_S3CMCI
-+       s3c_device_sdi.dev.platform_data = NULL;
-+       platform_device_register(&s3c_device_sdi); /* @@@ just for testing */
-+#endif /* CONFIG_AR6K_S3CMCI */
-+
-        platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
+-static struct s3c24xx_mci_pdata gta02_mmc_cfg = {
+-       .gpio_detect    = GTA02v1_GPIO_nSD_DETECT,
+-       .set_power      = NULL,
+-       .ocr_avail      = MMC_VDD_32_33,
+-};
+-
+ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
+ {
+        printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
+@@ -1529,7 +1523,7 @@
+        &s3c_device_usb,
+        &s3c_device_wdt,
+        &gta02_memconfig_device,
+-       // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */
++       &s3c_device_sdi,
+        &s3c_device_usbgadget,
+        &s3c_device_nand,
+        &gta02_nor_flash,
+@@ -1607,17 +1601,6 @@
  
-        s3c2410_pm_init();
+        s3c_device_usb.dev.platform_data = &gta02_usb_info;
+        s3c_device_nand.dev.platform_data = &gta02_nand_info;
+-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
+-
+-       /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
+-        * hot-pluggable, this is not required anyway */
+-       switch (system_rev) {
+-       case GTA02v1_SYSTEM_REV:
+-               break;
+-       default:
+-               gta02_mmc_cfg.gpio_detect = 0;
+-               break;
+-       }
+ 
+        /* acc sensor chip selects */
+        s3c2410_gpio_setpin(S3C2410_GPD12, 1);

developers/werner/wlan-spi/patches-tracking/hif-linux-sdio.patch

@@ -12 +12 @@
 Index: ktrack/drivers/ar6000/Makefile
 ===================================================================
---- ktrack.orig/drivers/ar6000/Makefile 2008-11-02 08:01:22.000000000 -0200
-+++ ktrack/drivers/ar6000/Makefile      2008-11-02 08:04:17.000000000 -0200
+--- ktrack.orig/drivers/ar6000/Makefile 2008-11-02 23:09:13.000000000 -0200
++++ ktrack/drivers/ar6000/Makefile      2008-11-02 23:09:15.000000000 -0200
 @@ -21,7 +21,7 @@
                 htc/htc_recv.o             \
@@ -26 +26 @@
 ===================================================================
 --- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ ktrack/drivers/ar6000/hif/hif2.c    2008-11-02 12:01:30.000000000 -0200
-@@ -0,0 +1,593 @@
++++ ktrack/drivers/ar6000/hif/hif2.c    2008-11-02 23:46:53.000000000 -0200
+@@ -0,0 +1,598 @@
 +/*
 + * hif2.c - HIF layer re-implementation for the Linux SDIO stack
@@ -51 +51 @@
 +#include <linux/wait.h>
 +#include <linux/spinlock.h>
++#include <linux/sched.h>
 +#include <linux/mmc/sdio_func.h>
 +#include <linux/mmc/sdio.h>
@@ -214 +215 @@
 +{
 +       struct hif_device *hif = data;
++       struct sched_param param = { .sched_priority = 2 };
++               /* one priority level slower than ksdioirqd (which is at 1) */
 +       DEFINE_WAIT(wait);
 +       struct hif_request *req;
++
++       sched_setscheduler(current, SCHED_FIFO, &param);
 +
 +       while (1) {

developers/werner/wlan-spi/patches-tracking/series

@@ -20 +20 @@
 sdio-add-atheros-ar6k.patch
 hif-linux-sdio.patch
-gta02-mmc-spi-bitbang.patch
 
 gta02-mmc-mci.patch
@@ -26 +25 @@
 # dirty experimental stuff follows
 
-# didn't survive the move to 2.6.27 :-(
-#hack-dont-poll-irq.patch 
-#hif-direct-interrupt.patch
 #hif-can-do-async.patch