--- Begin Message ---
Author: werner
Date: 2008-10-31 00:55:43 +0100 (Fri, 31 Oct 2008)
New Revision: 4735
Added:
developers/werner/wlan-spi/patches-tracking/christer-mmc-byte-alignment.patch
developers/werner/wlan-spi/patches-tracking/drivers-s3c24xx-mmc-add-us-to-copyright-header.patch
developers/werner/wlan-spi/patches-tracking/hack-revert-s3cmci.patch
developers/werner/wlan-spi/patches-tracking/s3c24xx-cpufreq-driver-mmc.patch
developers/werner/wlan-spi/patches-tracking/s3c24xx-mmc-faster-transfer-core.patch
Modified:
developers/werner/wlan-spi/patches-tracking/series
Log:
s3cmci currently doesn't work with our SDIO, although it did not too
long ago. To find the cause, we revert all the recent changes, and
examine them one by one.
Added:
developers/werner/wlan-spi/patches-tracking/christer-mmc-byte-alignment.patch
===================================================================
---
developers/werner/wlan-spi/patches-tracking/christer-mmc-byte-alignment.patch
(rev 0)
+++
developers/werner/wlan-spi/patches-tracking/christer-mmc-byte-alignment.patch
2008-10-30 23:55:43 UTC (rev 4735)
@@ -0,0 +1,228 @@
+From: Christer Weinigel <[EMAIL PROTECTED]>
+
+To be able to do SDIO the s3cmci driver has to support non-word-sized
+transfers. Change pio_words into pio_bytes and fix up all the places
+where it is used.
+
+This variant of the patch will not overrun the buffer when reading an
+odd number of bytes. When writing, this variant will still read past
+the end of the buffer, but since the driver can't support non-word-
+aligned transfers anyway, this should not be a problem, since a
+word-aligned transfer will never cross a page boundary.
+
+This has been tested with a CSR SDIO Bluetooth Type A device on a
+Samsung S3C24A0 processor.
+
+Signed-off-by: Christer Weinigel <[EMAIL PROTECTED]>
+Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
+
+Index: linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c
+===================================================================
+--- linux-2.6.27-rc7.orig/drivers/mmc/host/s3cmci.c 2008-09-26
18:38:51.000000000 +0100
++++ linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c 2008-09-26 18:38:51.000000000
+0100
+@@ -190,7 +190,7 @@ static inline void clear_imask(struct s3
+ }
+
+ static inline int get_data_buffer(struct s3cmci_host *host,
+- u32 *words, u32 **pointer)
++ u32 *bytes, u32 **pointer)
+ {
+ struct scatterlist *sg;
+
+@@ -207,7 +207,7 @@ static inline int get_data_buffer(struct
+ }
+ sg = &host->mrq->data->sg[host->pio_sgptr];
+
+- *words = sg->length >> 2;
++ *bytes = sg->length;
+ *pointer = sg_virt(sg);
+
+ host->pio_sgptr++;
+@@ -223,7 +223,7 @@ static inline u32 fifo_count(struct s3cm
+ u32 fifostat = readl(host->base + S3C2410_SDIFSTA);
+
+ fifostat &= S3C2410_SDIFSTA_COUNTMASK;
+- return fifostat >> 2;
++ return fifostat;
+ }
+
+ static inline u32 fifo_free(struct s3cmci_host *host)
+@@ -231,13 +231,14 @@ static inline u32 fifo_free(struct s3cmc
+ u32 fifostat = readl(host->base + S3C2410_SDIFSTA);
+
+ fifostat &= S3C2410_SDIFSTA_COUNTMASK;
+- return (63 - fifostat) >> 2;
++ return 63 - fifostat;
+ }
+
+ static void do_pio_read(struct s3cmci_host *host)
+ {
+ int res;
+ u32 fifo;
++ u32 fifo_words;
+ void __iomem *from_ptr;
+
+ /* write real prescaler to host, it might be set slow to fix */
+@@ -246,8 +247,8 @@ static void do_pio_read(struct s3cmci_ho
+ from_ptr = host->base + host->sdidata;
+
+ while ((fifo = fifo_count(host))) {
+- if (!host->pio_words) {
+- res = get_data_buffer(host, &host->pio_words,
++ if (!host->pio_bytes) {
++ res = get_data_buffer(host, &host->pio_bytes,
+ &host->pio_ptr);
+ if (res) {
+ host->pio_active = XFER_NONE;
+@@ -260,26 +261,45 @@ static void do_pio_read(struct s3cmci_ho
+
+ dbg(host, dbg_pio,
+ "pio_read(): new target: [EMAIL PROTECTED]",
+- host->pio_words, host->pio_ptr);
++ host->pio_bytes, host->pio_ptr);
+ }
+
+ dbg(host, dbg_pio,
+ "pio_read(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n",
+- fifo, host->pio_words,
++ fifo, host->pio_bytes,
+ readl(host->base + S3C2410_SDIDCNT));
+
+- if (fifo > host->pio_words)
+- fifo = host->pio_words;
++ /* If we have reached the end of the block, we can
++ * read a word and get 1 to 3 bytes. If we in the
++ * middle of the block, we have to read full words,
++ * otherwise we will write garbage, so round down to
++ * an even multiple of 4. */
++ if (fifo >= host->pio_bytes)
++ fifo = host->pio_bytes;
++ else
++ fifo -= fifo & 3;
+
+- host->pio_words -= fifo;
++ host->pio_bytes -= fifo;
+ host->pio_count += fifo;
+
+- while (fifo--)
++ fifo_words = fifo >> 2;
++ while (fifo_words--)
+ *(host->pio_ptr++) = readl(from_ptr);
++
++ if (fifo & 3) {
++ u32 n = fifo & 3;
++ u32 data = readl(from_ptr);
++ u8 *p = (u8 *)host->pio_ptr;
++
++ while (n--) {
++ *p++ = data;
++ data >>= 8;
++ }
++ }
+ }
+
+- if (!host->pio_words) {
+- res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
++ if (!host->pio_bytes) {
++ res = get_data_buffer(host, &host->pio_bytes, &host->pio_ptr);
+ if (res) {
+ dbg(host, dbg_pio,
+ "pio_read(): complete (no more buffers).\n");
+@@ -303,8 +323,8 @@ static void do_pio_write(struct s3cmci_h
+ to_ptr = host->base + host->sdidata;
+
+ while ((fifo = fifo_free(host))) {
+- if (!host->pio_words) {
+- res = get_data_buffer(host, &host->pio_words,
++ if (!host->pio_bytes) {
++ res = get_data_buffer(host, &host->pio_bytes,
+ &host->pio_ptr);
+ if (res) {
+ dbg(host, dbg_pio,
+@@ -316,16 +336,23 @@ static void do_pio_write(struct s3cmci_h
+
+ dbg(host, dbg_pio,
+ "pio_write(): new source: [EMAIL PROTECTED]",
+- host->pio_words, host->pio_ptr);
++ host->pio_bytes, host->pio_ptr);
+
+ }
+
+- if (fifo > host->pio_words)
+- fifo = host->pio_words;
++ /* If we have reached the end of the block, we have to
++ * write exactly the remaining number of bytes. If we
++ * in the middle of the block, we have to write full
++ * words, so round down to an even multiple of 4. */
++ if (fifo >= host->pio_bytes)
++ fifo = host->pio_bytes;
++ else
++ fifo -= fifo & 3;
+
+- host->pio_words -= fifo;
++ host->pio_bytes -= fifo;
+ host->pio_count += fifo;
+
++ fifo = (fifo + 3) >> 2;
+ while (fifo--)
+ writel(*(host->pio_ptr++), to_ptr);
+ }
+@@ -350,9 +377,9 @@ static void pio_tasklet(unsigned long da
+ clear_imask(host);
+ if (host->pio_active != XFER_NONE) {
+ dbg(host, dbg_err, "unfinished %s "
+- "- pio_count:[%u] pio_words:[%u]\n",
++ "- pio_count:[%u] pio_bytes:[%u]\n",
+ (host->pio_active == XFER_READ) ? "read" : "write",
+- host->pio_count, host->pio_words);
++ host->pio_count, host->pio_bytes);
+
+ if (host->mrq->data)
+ host->mrq->data->error = -EINVAL;
+@@ -813,11 +840,10 @@ static int s3cmci_setup_data(struct s3cm
+ /* We cannot deal with unaligned blocks with more than
+ * one block being transfered. */
+
+- if (data->blocks > 1)
++ if (data->blocks > 1) {
++ pr_warning("%s: can't do non-word sized block transfers
(blksz %d)\n", __func__, data->blksz);
+ return -EINVAL;
+-
+- /* No support yet for non-word block transfers. */
+- return -EINVAL;
++ }
+ }
+
+ while (readl(host->base + S3C2410_SDIDSTA) &
+@@ -897,7 +923,7 @@ static int s3cmci_prepare_pio(struct s3c
+ BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR);
+
+ host->pio_sgptr = 0;
+- host->pio_words = 0;
++ host->pio_bytes = 0;
+ host->pio_count = 0;
+ host->pio_active = rw ? XFER_WRITE : XFER_READ;
+
+Index: linux-2.6.27-rc7/drivers/mmc/host/s3cmci.h
+===================================================================
+--- linux-2.6.27-rc7.orig/drivers/mmc/host/s3cmci.h 2008-09-26
18:38:51.000000000 +0100
++++ linux-2.6.27-rc7/drivers/mmc/host/s3cmci.h 2008-09-26 18:38:51.000000000
+0100
+@@ -51,7 +51,7 @@ struct s3cmci_host {
+ int dma_complete;
+
+ u32 pio_sgptr;
+- u32 pio_words;
++ u32 pio_bytes;
+ u32 pio_count;
+ u32 *pio_ptr;
+ #define XFER_NONE 0
+
+--
+Ben ([EMAIL PROTECTED], http://www.fluff.org/)
+
+ 'a smiley only costs 4 bytes'
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
Added:
developers/werner/wlan-spi/patches-tracking/drivers-s3c24xx-mmc-add-us-to-copyright-header.patch
===================================================================
---
developers/werner/wlan-spi/patches-tracking/drivers-s3c24xx-mmc-add-us-to-copyright-header.patch
(rev 0)
+++
developers/werner/wlan-spi/patches-tracking/drivers-s3c24xx-mmc-add-us-to-copyright-header.patch
2008-10-30 23:55:43 UTC (rev 4735)
@@ -0,0 +1,42 @@
+Since the original authour (Thomas Kleffel) has been too busy to
+merge the s3cmci driver and keep it up to date, I (mostly as part
+of my role with Simtec Electronics) got the driver to a mergable
+state and have been maintaining it since I think that I should
+be added to the header. Also add a copyright statement for the
+new work.
+
+Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
+
+Index: linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c
+===================================================================
+--- linux-2.6.27-rc7.orig/drivers/mmc/host/s3cmci.c 2008-09-26
18:38:52.000000000 +0100
++++ linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c 2008-09-26 18:38:52.000000000
+0100
+@@ -3,6 +3,9 @@
+ *
+ * Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <[EMAIL PROTECTED]>
+ *
++ * Current driver maintained by Ben Dooks and Simtec Electronics
++ * Copyright (C) 2008 Simtec Electronics <[EMAIL PROTECTED]>
++ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+@@ -1560,7 +1563,7 @@ module_exit(s3cmci_exit);
+
+ MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
+ MODULE_LICENSE("GPL v2");
+-MODULE_AUTHOR("Thomas Kleffel <[EMAIL PROTECTED]>");
++MODULE_AUTHOR("Thomas Kleffel <[EMAIL PROTECTED]>, Ben Dooks <[EMAIL
PROTECTED]>");
+ MODULE_ALIAS("platform:s3c2410-sdi");
+ MODULE_ALIAS("platform:s3c2412-sdi");
+ MODULE_ALIAS("platform:s3c2440-sdi");
+
+--
+Ben ([EMAIL PROTECTED], http://www.fluff.org/)
+
+ 'a smiley only costs 4 bytes'
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
Added: developers/werner/wlan-spi/patches-tracking/hack-revert-s3cmci.patch
===================================================================
--- developers/werner/wlan-spi/patches-tracking/hack-revert-s3cmci.patch
(rev 0)
+++ developers/werner/wlan-spi/patches-tracking/hack-revert-s3cmci.patch
2008-10-30 23:55:43 UTC (rev 4735)
@@ -0,0 +1,461 @@
+Index: ktrack/drivers/mmc/host/s3cmci.c
+===================================================================
+--- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-10-30 21:33:18.000000000
-0200
++++ ktrack/drivers/mmc/host/s3cmci.c 2008-10-30 21:33:28.000000000 -0200
+@@ -2,10 +2,6 @@
+ * linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
+ *
+ * Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <[EMAIL PROTECTED]>
+- * Copyright (C) 2007 Harald Welte <[EMAIL PROTECTED]>
+- *
+- * Current driver maintained by Ben Dooks and Simtec Electronics
+- * Copyright (C) 2008 Simtec Electronics <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+@@ -17,7 +13,6 @@
+ #include <linux/clk.h>
+ #include <linux/mmc/host.h>
+ #include <linux/platform_device.h>
+-#include <linux/cpufreq.h>
+ #include <linux/irq.h>
+ #include <linux/io.h>
+
+@@ -28,14 +23,6 @@
+
+ #include <asm/plat-s3c24xx/mci.h>
+
+-#include <asm/dma.h>
+-#include <asm/dma-mapping.h>
+-
+-#include <asm/io.h>
+-#include <mach/regs-gpio.h>
+-#include <mach/mci.h>
+-#include <mach/dma.h>
+-
+ #include "s3cmci.h"
+
+ #define DRIVER_NAME "s3c-mci"
+@@ -52,9 +39,9 @@
+ dbg_conf = (1 << 8),
+ };
+
+-static const int dbgmap_err = dbg_fail;
++static const int dbgmap_err = dbg_err | dbg_fail;
+ static const int dbgmap_info = dbg_info | dbg_conf;
+-static const int dbgmap_debug = dbg_err | dbg_debug;
++static const int dbgmap_debug = dbg_debug;
+
+ #define dbg(host, channels, args...) \
+ do { \
+@@ -202,7 +189,7 @@
+ }
+
+ static inline int get_data_buffer(struct s3cmci_host *host,
+- u32 *bytes, u32 **pointer)
++ u32 *words, u32 **pointer)
+ {
+ struct scatterlist *sg;
+
+@@ -219,7 +206,7 @@
+ }
+ sg = &host->mrq->data->sg[host->pio_sgptr];
+
+- *bytes = sg->length;
++ *words = sg->length >> 2;
+ *pointer = sg_virt(sg);
+
+ host->pio_sgptr++;
+@@ -235,7 +222,7 @@
+ u32 fifostat = readl(host->base + S3C2410_SDIFSTA);
+
+ fifostat &= S3C2410_SDIFSTA_COUNTMASK;
+- return fifostat;
++ return fifostat >> 2;
+ }
+
+ static inline u32 fifo_free(struct s3cmci_host *host)
+@@ -243,15 +230,13 @@
+ u32 fifostat = readl(host->base + S3C2410_SDIFSTA);
+
+ fifostat &= S3C2410_SDIFSTA_COUNTMASK;
+- return 63 - fifostat;
++ return (63 - fifostat) >> 2;
+ }
+
+ static void do_pio_read(struct s3cmci_host *host)
+ {
+ int res;
+ u32 fifo;
+- u32 *ptr;
+- u32 fifo_words;
+ void __iomem *from_ptr;
+
+ /* write real prescaler to host, it might be set slow to fix */
+@@ -260,8 +245,8 @@
+ from_ptr = host->base + host->sdidata;
+
+ while ((fifo = fifo_count(host))) {
+- if (!host->pio_bytes) {
+- res = get_data_buffer(host, &host->pio_bytes,
++ if (!host->pio_words) {
++ res = get_data_buffer(host, &host->pio_words,
+ &host->pio_ptr);
+ if (res) {
+ host->pio_active = XFER_NONE;
+@@ -274,47 +259,26 @@
+
+ dbg(host, dbg_pio,
+ "pio_read(): new target: [EMAIL PROTECTED]",
+- host->pio_bytes, host->pio_ptr);
++ host->pio_words, host->pio_ptr);
+ }
+
+ dbg(host, dbg_pio,
+ "pio_read(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n",
+- fifo, host->pio_bytes,
++ fifo, host->pio_words,
+ readl(host->base + S3C2410_SDIDCNT));
+
+- /* If we have reached the end of the block, we can
+- * read a word and get 1 to 3 bytes. If we in the
+- * middle of the block, we have to read full words,
+- * otherwise we will write garbage, so round down to
+- * an even multiple of 4. */
+- if (fifo >= host->pio_bytes)
+- fifo = host->pio_bytes;
+- else
+- fifo -= fifo & 3;
++ if (fifo > host->pio_words)
++ fifo = host->pio_words;
+
+- host->pio_bytes -= fifo;
++ host->pio_words -= fifo;
+ host->pio_count += fifo;
+
+- fifo_words = fifo >> 2;
+- ptr = host->pio_ptr;
+- while (fifo_words--)
+- *ptr++ = readl(from_ptr);
+- host->pio_ptr = ptr;
+-
+- if (fifo & 3) {
+- u32 n = fifo & 3;
+- u32 data = readl(from_ptr);
+- u8 *p = (u8 *)host->pio_ptr;
+-
+- while (n--) {
+- *p++ = data;
+- data >>= 8;
+- }
+- }
++ while (fifo--)
++ *(host->pio_ptr++) = readl(from_ptr);
+ }
+
+- if (!host->pio_bytes) {
+- res = get_data_buffer(host, &host->pio_bytes, &host->pio_ptr);
++ if (!host->pio_words) {
++ res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
+ if (res) {
+ dbg(host, dbg_pio,
+ "pio_read(): complete (no more buffers).\n");
+@@ -334,13 +298,12 @@
+ void __iomem *to_ptr;
+ int res;
+ u32 fifo;
+- u32 *ptr;
+
+ to_ptr = host->base + host->sdidata;
+
+ while ((fifo = fifo_free(host))) {
+- if (!host->pio_bytes) {
+- res = get_data_buffer(host, &host->pio_bytes,
++ if (!host->pio_words) {
++ res = get_data_buffer(host, &host->pio_words,
+ &host->pio_ptr);
+ if (res) {
+ dbg(host, dbg_pio,
+@@ -352,27 +315,18 @@
+
+ dbg(host, dbg_pio,
+ "pio_write(): new source: [EMAIL PROTECTED]",
+- host->pio_bytes, host->pio_ptr);
++ host->pio_words, host->pio_ptr);
+
+ }
+
+- /* If we have reached the end of the block, we have to
+- * write exactly the remaining number of bytes. If we
+- * in the middle of the block, we have to write full
+- * words, so round down to an even multiple of 4. */
+- if (fifo >= host->pio_bytes)
+- fifo = host->pio_bytes;
+- else
+- fifo -= fifo & 3;
++ if (fifo > host->pio_words)
++ fifo = host->pio_words;
+
+- host->pio_bytes -= fifo;
++ host->pio_words -= fifo;
+ host->pio_count += fifo;
+
+- fifo = (fifo + 3) >> 2;
+- ptr = host->pio_ptr;
+ while (fifo--)
+- writel(*ptr++, to_ptr);
+- host->pio_ptr = ptr;
++ writel(*(host->pio_ptr++), to_ptr);
+ }
+
+ enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
+@@ -382,6 +336,7 @@
+ {
+ struct s3cmci_host *host = (struct s3cmci_host *) data;
+
++
+ disable_irq(host->irq);
+
+ if (host->pio_active == XFER_WRITE)
+@@ -394,9 +349,9 @@
+ clear_imask(host);
+ if (host->pio_active != XFER_NONE) {
+ dbg(host, dbg_err, "unfinished %s "
+- "- pio_count:[%u] pio_bytes:[%u]\n",
++ "- pio_count:[%u] pio_words:[%u]\n",
+ (host->pio_active == XFER_READ) ? "read" : "write",
+- host->pio_count, host->pio_bytes);
++ host->pio_count, host->pio_words);
+
+ if (host->mrq->data)
+ host->mrq->data->error = -EINVAL;
+@@ -622,6 +577,7 @@
+
+ spin_unlock_irqrestore(&host->complete_lock, iflags);
+ return IRQ_HANDLED;
++
+ }
+
+ /*
+@@ -856,10 +812,11 @@
+ /* We cannot deal with unaligned blocks with more than
+ * one block being transfered. */
+
+- if (data->blocks > 1) {
+- pr_warning("%s: can't do non-word sized block transfers
(blksz %d)\n", __func__, data->blksz);
++ if (data->blocks > 1)
+ return -EINVAL;
+- }
++
++ /* No support yet for non-word block transfers. */
++ return -EINVAL;
+ }
+
+ while (readl(host->base + S3C2410_SDIDSTA) &
+@@ -939,7 +896,7 @@
+ BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR);
+
+ host->pio_sgptr = 0;
+- host->pio_bytes = 0;
++ host->pio_words = 0;
+ host->pio_count = 0;
+ host->pio_active = rw ? XFER_WRITE : XFER_READ;
+
+@@ -1034,7 +991,6 @@
+ dbg(host, dbg_err, "data prepare error %d\n", res);
+ cmd->error = res;
+ cmd->data->error = res;
+- cmd->data->error = -EIO;
+
+ mmc_request_done(mmc, mrq);
+ return;
+@@ -1077,33 +1033,10 @@
+ s3cmci_send_request(mmc);
+ }
+
+-static void s3cmci_set_clk(struct s3cmci_host *host, struct mmc_ios *ios)
+-{
+- u32 mci_psc;
+-
+- /* Set clock */
+- for (mci_psc = 0; mci_psc < 255; mci_psc++) {
+- host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
+-
+- if (host->real_rate <= ios->clock)
+- break;
+- }
+-
+- if (mci_psc > 255)
+- mci_psc = 255;
+-
+- host->prescaler = mci_psc;
+- writel(host->prescaler, host->base + S3C2410_SDIPRE);
+-
+- /* If requested clock is 0, real_rate will be 0, too */
+- if (ios->clock == 0)
+- host->real_rate = 0;
+-}
+-
+ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+ {
+ struct s3cmci_host *host = mmc_priv(mmc);
+- u32 mci_con;
++ u32 mci_psc, mci_con;
+
+ /* Set the power state */
+
+@@ -1141,7 +1074,23 @@
+ break;
+ }
+
+- s3cmci_set_clk(host, ios);
++ /* Set clock */
++ for (mci_psc = 0; mci_psc < 255; mci_psc++) {
++ host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
++
++ if (host->real_rate <= ios->clock)
++ break;
++ }
++
++ if (mci_psc > 255)
++ mci_psc = 255;
++
++ host->prescaler = mci_psc;
++ writel(host->prescaler, host->base + S3C2410_SDIPRE);
++
++ /* If requested clock is 0, real_rate will be 0, too */
++ if (ios->clock == 0)
++ host->real_rate = 0;
+
+ /* Set CLOCK_ENABLE */
+ if (ios->clock)
+@@ -1199,61 +1148,6 @@
+ * checks. Any zero fields to ensure reaonable defaults are picked. */
+ };
+
+-#ifdef CONFIG_CPU_FREQ
+-
+-static int s3cmci_cpufreq_transition(struct notifier_block *nb,
+- unsigned long val, void *data)
+-{
+- struct s3cmci_host *host;
+- struct mmc_host *mmc;
+- unsigned long newclk;
+- unsigned long flags;
+-
+- host = container_of(nb, struct s3cmci_host, freq_transition);
+- newclk = clk_get_rate(host->clk);
+- mmc = host->mmc;
+-
+- if ((val == CPUFREQ_PRECHANGE && newclk > host->clk_rate) ||
+- (val == CPUFREQ_POSTCHANGE && newclk < host->clk_rate)) {
+- spin_lock_irqsave(&mmc->lock, flags);
+-
+- host->clk_rate = newclk;
+-
+- if (mmc->ios.power_mode != MMC_POWER_OFF &&
+- mmc->ios.clock != 0)
+- s3cmci_set_clk(host, &mmc->ios);
+-
+- spin_unlock_irqrestore(&mmc->lock, flags);
+- }
+-
+- return 0;
+-}
+-
+-static inline int s3cmci_cpufreq_register(struct s3cmci_host *host)
+-{
+- host->freq_transition.notifier_call = s3cmci_cpufreq_transition;
+-
+- return cpufreq_register_notifier(&host->freq_transition,
+- CPUFREQ_TRANSITION_NOTIFIER);
+-}
+-
+-static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
+-{
+- cpufreq_unregister_notifier(&host->freq_transition,
+- CPUFREQ_TRANSITION_NOTIFIER);
+-}
+-
+-#else
+-static inline int s3cmci_cpufreq_register(struct s3cmci_host *host)
+-{
+- return 0;
+-}
+-
+-static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
+-{
+-}
+-#endif
+-
+ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)
+ {
+ struct s3cmci_host *host;
+@@ -1404,16 +1298,10 @@
+ (host->is2440?"2440":""),
+ host->base, host->irq, host->irq_cd, host->dma);
+
+- ret = s3cmci_cpufreq_register(host);
+- if (ret) {
+- dev_err(&pdev->dev, "failed to register cpufreq\n");
+- goto free_dmabuf;
+- }
+-
+ ret = mmc_add_host(mmc);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to add mmc host.\n");
+- goto free_cpufreq;
++ goto free_dmabuf;
+ }
+
+ platform_set_drvdata(pdev, mmc);
+@@ -1421,9 +1309,6 @@
+
+ return 0;
+
+- free_cpufreq:
+- s3cmci_cpufreq_deregister(host);
+-
+ free_dmabuf:
+ clk_disable(host->clk);
+
+@@ -1457,7 +1342,6 @@
+ if (host->irq_cd >= 0)
+ free_irq(host->irq_cd, host);
+
+- s3cmci_cpufreq_deregister(host);
+ mmc_remove_host(mmc);
+ clk_disable(host->clk);
+ }
+@@ -1571,8 +1455,7 @@
+
+ MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
+ MODULE_LICENSE("GPL v2");
+-MODULE_AUTHOR("Thomas Kleffel <[EMAIL PROTECTED]>, Ben Dooks <[EMAIL
PROTECTED]>");
++MODULE_AUTHOR("Thomas Kleffel <[EMAIL PROTECTED]>");
+ MODULE_ALIAS("platform:s3c2410-sdi");
+ MODULE_ALIAS("platform:s3c2412-sdi");
+ MODULE_ALIAS("platform:s3c2440-sdi");
+-
+Index: ktrack/drivers/mmc/host/s3cmci.h
+===================================================================
+--- ktrack.orig/drivers/mmc/host/s3cmci.h 2008-10-30 21:33:18.000000000
-0200
++++ ktrack/drivers/mmc/host/s3cmci.h 2008-10-30 21:33:29.000000000 -0200
+@@ -51,7 +51,7 @@
+ int dma_complete;
+
+ u32 pio_sgptr;
+- u32 pio_bytes;
++ u32 pio_words;
+ u32 pio_count;
+ u32 *pio_ptr;
+ #define XFER_NONE 0
+@@ -67,8 +67,4 @@
+
+ unsigned int ccnt, dcnt;
+ struct tasklet_struct pio_tasklet;
+-
+-#ifdef CONFIG_CPU_FREQ
+- struct notifier_block freq_transition;
+-#endif
+ };
Added:
developers/werner/wlan-spi/patches-tracking/s3c24xx-cpufreq-driver-mmc.patch
===================================================================
---
developers/werner/wlan-spi/patches-tracking/s3c24xx-cpufreq-driver-mmc.patch
(rev 0)
+++
developers/werner/wlan-spi/patches-tracking/s3c24xx-cpufreq-driver-mmc.patch
2008-10-30 23:55:43 UTC (rev 4735)
@@ -0,0 +1,198 @@
+Add support for CPU frequency scalling for the s3c_mci
+driver.
+
+Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
+
+Index: linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c
+===================================================================
+--- linux-2.6.27-rc7.orig/drivers/mmc/host/s3cmci.c 2008-09-26
18:38:40.000000000 +0100
++++ linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c 2008-09-26 18:38:51.000000000
+0100
+@@ -13,6 +13,7 @@
+ #include <linux/clk.h>
+ #include <linux/mmc/host.h>
+ #include <linux/platform_device.h>
++#include <linux/cpufreq.h>
+ #include <linux/irq.h>
+ #include <linux/io.h>
+
+@@ -1033,10 +1034,33 @@ static void s3cmci_request(struct mmc_ho
+ s3cmci_send_request(mmc);
+ }
+
++static void s3cmci_set_clk(struct s3cmci_host *host, struct mmc_ios *ios)
++{
++ u32 mci_psc;
++
++ /* Set clock */
++ for (mci_psc = 0; mci_psc < 255; mci_psc++) {
++ host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
++
++ if (host->real_rate <= ios->clock)
++ break;
++ }
++
++ if (mci_psc > 255)
++ mci_psc = 255;
++
++ host->prescaler = mci_psc;
++ writel(host->prescaler, host->base + S3C2410_SDIPRE);
++
++ /* If requested clock is 0, real_rate will be 0, too */
++ if (ios->clock == 0)
++ host->real_rate = 0;
++}
++
+ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+ {
+ struct s3cmci_host *host = mmc_priv(mmc);
+- u32 mci_psc, mci_con;
++ u32 mci_con;
+
+ /* Set the power state */
+
+@@ -1074,23 +1098,7 @@ static void s3cmci_set_ios(struct mmc_ho
+ break;
+ }
+
+- /* Set clock */
+- for (mci_psc = 0; mci_psc < 255; mci_psc++) {
+- host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
+-
+- if (host->real_rate <= ios->clock)
+- break;
+- }
+-
+- if (mci_psc > 255)
+- mci_psc = 255;
+-
+- host->prescaler = mci_psc;
+- writel(host->prescaler, host->base + S3C2410_SDIPRE);
+-
+- /* If requested clock is 0, real_rate will be 0, too */
+- if (ios->clock == 0)
+- host->real_rate = 0;
++ s3cmci_set_clk(host, ios);
+
+ /* Set CLOCK_ENABLE */
+ if (ios->clock)
+@@ -1148,6 +1156,61 @@ static struct s3c24xx_mci_pdata s3cmci_d
+ * checks. Any zero fields to ensure reaonable defaults are picked. */
+ };
+
++#ifdef CONFIG_CPU_FREQ
++
++static int s3cmci_cpufreq_transition(struct notifier_block *nb,
++ unsigned long val, void *data)
++{
++ struct s3cmci_host *host;
++ struct mmc_host *mmc;
++ unsigned long newclk;
++ unsigned long flags;
++
++ host = container_of(nb, struct s3cmci_host, freq_transition);
++ newclk = clk_get_rate(host->clk);
++ mmc = host->mmc;
++
++ if ((val == CPUFREQ_PRECHANGE && host->clk_rate > newclk) ||
++ (val == CPUFREQ_POSTCHANGE && host->clk_rate < newclk)) {
++ spin_lock_irqsave(&mmc->lock, flags);
++
++ host->clk_rate = newclk;
++
++ if (mmc->ios.power_mode != MMC_POWER_OFF &&
++ mmc->ios.clock != 0)
++ s3cmci_set_clk(host, &mmc->ios);
++
++ spin_unlock_irqrestore(&mmc->lock, flags);
++ }
++
++ return 0;
++}
++
++static inline int s3cmci_cpufreq_register(struct s3cmci_host *host)
++{
++ host->freq_transition.notifier_call = s3cmci_cpufreq_transition;
++
++ return cpufreq_register_notifier(&host->freq_transition,
++ CPUFREQ_TRANSITION_NOTIFIER);
++}
++
++static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
++{
++ cpufreq_unregister_notifier(&host->freq_transition,
++ CPUFREQ_TRANSITION_NOTIFIER);
++}
++
++#else
++static inline int s3cmci_cpufreq_register(struct s3cmci_host *host)
++{
++ return 0;
++}
++
++static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
++{
++}
++#endif
++
+ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)
+ {
+ struct s3cmci_host *host;
+@@ -1298,10 +1361,16 @@ static int __devinit s3cmci_probe(struct
+ (host->is2440?"2440":""),
+ host->base, host->irq, host->irq_cd, host->dma);
+
++ ret = s3cmci_cpufreq_register(host);
++ if (ret) {
++ dev_err(&pdev->dev, "failed to register cpufreq\n");
++ goto free_dmabuf;
++ }
++
+ ret = mmc_add_host(mmc);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to add mmc host.\n");
+- goto free_dmabuf;
++ goto free_cpufreq;
+ }
+
+ platform_set_drvdata(pdev, mmc);
+@@ -1309,6 +1378,9 @@ static int __devinit s3cmci_probe(struct
+
+ return 0;
+
++ free_cpufreq:
++ s3cmci_cpufreq_deregister(host);
++
+ free_dmabuf:
+ clk_disable(host->clk);
+
+@@ -1342,6 +1414,7 @@ static void s3cmci_shutdown(struct platf
+ if (host->irq_cd >= 0)
+ free_irq(host->irq_cd, host);
+
++ s3cmci_cpufreq_deregister(host);
+ mmc_remove_host(mmc);
+ clk_disable(host->clk);
+ }
+Index: linux-2.6.27-rc7/drivers/mmc/host/s3cmci.h
+===================================================================
+--- linux-2.6.27-rc7.orig/drivers/mmc/host/s3cmci.h 2008-09-26
18:38:40.000000000 +0100
++++ linux-2.6.27-rc7/drivers/mmc/host/s3cmci.h 2008-09-26 18:38:51.000000000
+0100
+@@ -67,4 +67,8 @@ struct s3cmci_host {
+
+ unsigned int ccnt, dcnt;
+ struct tasklet_struct pio_tasklet;
++
++#ifdef CONFIG_CPU_FREQ
++ struct notifier_block freq_transition;
++#endif
+ };
+
+--
+Ben ([EMAIL PROTECTED], http://www.fluff.org/)
+
+ 'a smiley only costs 4 bytes'
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
Added:
developers/werner/wlan-spi/patches-tracking/s3c24xx-mmc-faster-transfer-core.patch
===================================================================
---
developers/werner/wlan-spi/patches-tracking/s3c24xx-mmc-faster-transfer-core.patch
(rev 0)
+++
developers/werner/wlan-spi/patches-tracking/s3c24xx-mmc-faster-transfer-core.patch
2008-10-30 23:55:43 UTC (rev 4735)
@@ -0,0 +1,82 @@
+The s3cmci driver uses the host->pio_ptr field to
+point to the current position into the buffer for data
+transfer. During the transfers it does the following:
+
+ while (fifo_words--)
+ *(host->pio_ptr++) = readl(from_ptr);
+
+This is inefficent, as host->pio_ptr is not used in any
+other part of the transfer but the compiler emits code
+which does the following:
+
+ while (fifo_words--) {
+ u32 *ptr = host->pio_ptr;
+ *ptr = readl(from_ptr);
+ ptr++;
+ host->pio_ptr = ptr;
+ }
+
+This is obviously a waste of a load and store each time
+around the loop, which could be up to 16 times depending
+on how much needs to be transfered.
+
+Move the ptr accesses to outside the while loop so that
+we do not end up reloading/re-writing the pointer.
+
+Note, this seems to make the code 16 bytes larger.
+
+Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
+Index: linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c
+===================================================================
+--- linux-2.6.27-rc7.orig/drivers/mmc/host/s3cmci.c 2008-09-26
18:38:51.000000000 +0100
++++ linux-2.6.27-rc7/drivers/mmc/host/s3cmci.c 2008-09-26 18:38:52.000000000
+0100
+@@ -238,6 +238,7 @@ static void do_pio_read(struct s3cmci_ho
+ {
+ int res;
+ u32 fifo;
++ u32 *ptr;
+ u32 fifo_words;
+ void __iomem *from_ptr;
+
+@@ -283,8 +284,10 @@ static void do_pio_read(struct s3cmci_ho
+ host->pio_count += fifo;
+
+ fifo_words = fifo >> 2;
++ ptr = host->pio_ptr;
+ while (fifo_words--)
+- *(host->pio_ptr++) = readl(from_ptr);
++ *ptr++ = readl(from_ptr);
++ host->pio_ptr = ptr;
+
+ if (fifo & 3) {
+ u32 n = fifo & 3;
+@@ -319,6 +322,7 @@ static void do_pio_write(struct s3cmci_h
+ void __iomem *to_ptr;
+ int res;
+ u32 fifo;
++ u32 *ptr;
+
+ to_ptr = host->base + host->sdidata;
+
+@@ -353,8 +357,10 @@ static void do_pio_write(struct s3cmci_h
+ host->pio_count += fifo;
+
+ fifo = (fifo + 3) >> 2;
++ ptr = host->pio_ptr;
+ while (fifo--)
+- writel(*(host->pio_ptr++), to_ptr);
++ writel(*ptr++, to_ptr);
++ host->pio_ptr = ptr;
+ }
+
+ enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
+
+--
+Ben ([EMAIL PROTECTED], http://www.fluff.org/)
+
+ 'a smiley only costs 4 bytes'
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
Modified: developers/werner/wlan-spi/patches-tracking/series
===================================================================
--- developers/werner/wlan-spi/patches-tracking/series 2008-10-30 12:39:26 UTC
(rev 4734)
+++ developers/werner/wlan-spi/patches-tracking/series 2008-10-30 23:55:43 UTC
(rev 4735)
@@ -29,12 +29,21 @@
gta02-mmc-mci.patch
+# to find out how to unbreak mmc-mci, we revert the recent changes to s3cmci
+# and then apply them one by one, looking for the culprit.
+
+hack-revert-s3cmci.patch
+s3c24xx-cpufreq-driver-mmc.patch
+christer-mmc-byte-alignment.patch
+s3c24xx-mmc-faster-transfer-core.patch
+drivers-s3c24xx-mmc-add-us-to-copyright-header.patch
+
# 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
+#hack-dont-poll-irq.patch
+#hif-direct-interrupt.patch
+#hif-can-do-async.patch
# still needs a bit more love ...
-s3c-mmc-sdio-int.patch
+#s3c-mmc-sdio-int.patch
--- End Message ---
