* [PATCH 0/2 v4] Add SDHCI driver for Tegra
@ 2011-01-02 0:32 Olof Johansson
2011-01-02 0:37 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Olof Johansson
0 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2011-01-02 0:32 UTC (permalink / raw)
To: Chris Ball; +Cc: Wolfram Sang, linux-mmc, linux-tegra
Here we go again. Just a couple of minor changes to the 8-bit code, i.e.
allow boards to pass in which slots are actually wired 8-bit.
Changes since v1:
* Rewrote for sdhci-pltfm
Changes since v2:
* Whitespace fixes
* Changed order of test in get_ro
* 8-bit support
* Set gpio directions
Changes since v3:
* Add platform structure member for 8bit capabilities
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors
2011-01-02 0:32 [PATCH 0/2 v4] Add SDHCI driver for Tegra Olof Johansson
@ 2011-01-02 0:37 ` Olof Johansson
2011-01-02 0:37 ` [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs Olof Johansson
2011-01-03 6:25 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Kyungmin Park
0 siblings, 2 replies; 6+ messages in thread
From: Olof Johansson @ 2011-01-02 0:37 UTC (permalink / raw)
To: Chris Ball; +Cc: Wolfram Sang, linux-mmc, linux-tegra, Olof Johansson
Some controllers misparse segment length 0 as being 0, not 65536. Add
a quirk to deal with it.
Change-Id: I1422c9c605095addc133e844c66fc49f187dc17d
Signed-off-by: Olof Johansson <olof@lixom.net>
---
drivers/mmc/host/sdhci.c | 10 +++++++---
include/linux/mmc/sdhci.h | 2 ++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a25db426..c0094c1 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1928,10 +1928,14 @@ int sdhci_add_host(struct sdhci_host *host)
* of bytes. When doing hardware scatter/gather, each entry cannot
* be larger than 64 KiB though.
*/
- if (host->flags & SDHCI_USE_ADMA)
- mmc->max_seg_size = 65536;
- else
+ if (host->flags & SDHCI_USE_ADMA) {
+ if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC)
+ mmc->max_seg_size = 65535;
+ else
+ mmc->max_seg_size = 65536;
+ } else {
mmc->max_seg_size = mmc->max_req_size;
+ }
/*
* Maximum block size. This varies from controller to controller and
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 1fdc673..dfb2106 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -83,6 +83,8 @@ struct sdhci_host {
#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 (1<<28)
/* Controller doesn't have HISPD bit field in HI-SPEED SD card */
#define SDHCI_QUIRK_NO_HISPD_BIT (1<<29)
+/* Controller treats ADMA descriptors with length 0000h incorrectly */
+#define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC (1<<30)
int irq; /* Device IRQ */
void __iomem *ioaddr; /* Mapped address */
--
1.7.3.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs
2011-01-02 0:37 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Olof Johansson
@ 2011-01-02 0:37 ` Olof Johansson
2011-01-02 5:43 ` Chris Ball
2011-01-03 6:25 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Kyungmin Park
1 sibling, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2011-01-02 0:37 UTC (permalink / raw)
To: Chris Ball
Cc: Wolfram Sang, linux-mmc, linux-tegra, Olof Johansson, Yvonne Yip
SDHCI driver for Tegra. This driver plugs in as a new variant of
sdhci-pltfm, using the platform data structure passed in to specify the
GPIOs to use for card detect, write protect and card power enablement.
Original driver (of which only the header file is left):
Signed-off-by: Yvonne Yip <y@palm.com>
The rest, which has been rewritten by now:
Signed-off-by: Olof Johansson <olof@lixom.net>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mike Rapoport <mike@compulab.co.il>
---
SDHCI driver for Tegra. Pretty straight forward, a few pieces of
functionality left to fill in but nothing that stops it from going
upstream. Board enablement submitted separately.
Changes since v1:
* Rewrote for sdhci-pltfm
Changes since v2:
* Whitespace fixes
* Changed order of test in get_ro
* 8-bit support
* Set gpio directions
Changes since v3:
* Add platform structure member for 8bit capabilities
Change-Id: I18b322b57a7285d80c530bafaba04a6d84f668d5
---
arch/arm/mach-tegra/include/mach/sdhci.h | 29 ++++
drivers/mmc/host/Kconfig | 10 ++
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/sdhci-pltfm.c | 3 +
drivers/mmc/host/sdhci-pltfm.h | 1 +
drivers/mmc/host/sdhci-tegra.c | 257 ++++++++++++++++++++++++++++++
6 files changed, 301 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-tegra/include/mach/sdhci.h
create mode 100644 drivers/mmc/host/sdhci-tegra.c
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h
new file mode 100644
index 0000000..3ad086e
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/sdhci.h
@@ -0,0 +1,29 @@
+/*
+ * include/asm-arm/arch-tegra/include/mach/sdhci.h
+ *
+ * Copyright (C) 2009 Palm, Inc.
+ * Author: Yvonne Yip <y@palm.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H
+#define __ASM_ARM_ARCH_TEGRA_SDHCI_H
+
+#include <linux/mmc/host.h>
+
+struct tegra_sdhci_platform_data {
+ int cd_gpio;
+ int wp_gpio;
+ int power_gpio;
+ int is_8bit;
+};
+
+#endif
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index d618e86..25c6a2a 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -140,6 +140,16 @@ config MMC_SDHCI_ESDHC_IMX
If unsure, say N.
+config MMC_SDHCI_TEGRA
+ tristate "SDHCI platform support for the Tegra SD/MMC Controller"
+ depends on MMC_SDHCI_PLTFM && ARCH_TEGRA
+ select MMC_SDHCI_IO_ACCESSORS
+ help
+ This selects the Tegra SD/MMC controller. If you have a Tegra
+ platform with SD or MMC devices, say Y or M here.
+
+ If unsure, say N.
+
config MMC_SDHCI_S3C
tristate "SDHCI support on Samsung S3C SoC"
depends on MMC_SDHCI && PLAT_SAMSUNG
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 7b645ff..fc8f8f0 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o
sdhci-platform-y := sdhci-pltfm.o
sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o
sdhci-platform-$(CONFIG_MMC_SDHCI_ESDHC_IMX) += sdhci-esdhc-imx.o
+sdhci-platform-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o
obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
sdhci-of-y := sdhci-of-core.o
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 0502f89..d9e6e88 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -170,6 +170,9 @@ static const struct platform_device_id sdhci_pltfm_ids[] = {
#ifdef CONFIG_MMC_SDHCI_ESDHC_IMX
{ "sdhci-esdhc-imx", (kernel_ulong_t)&sdhci_esdhc_imx_pdata },
#endif
+#ifdef CONFIG_MMC_SDHCI_TEGRA
+ { "sdhci-tegra", (kernel_ulong_t)&sdhci_tegra_pdata },
+#endif
{ },
};
MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids);
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
index c1bfe48..6f631e3 100644
--- a/drivers/mmc/host/sdhci-pltfm.h
+++ b/drivers/mmc/host/sdhci-pltfm.h
@@ -22,5 +22,6 @@ struct sdhci_pltfm_host {
extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;
extern struct sdhci_pltfm_data sdhci_esdhc_imx_pdata;
+extern struct sdhci_pltfm_data sdhci_tegra_pdata;
#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
new file mode 100644
index 0000000..50abda8
--- /dev/null
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2010 The Chromium OS Authors <chromium-os-dev@chromium.org>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+
+#include <mach/gpio.h>
+#include <mach/sdhci.h>
+
+#include "sdhci.h"
+#include "sdhci-pltfm.h"
+
+static u32 tegra_sdhci_readl(struct sdhci_host *host, int reg)
+{
+ u32 val;
+
+ if (unlikely(reg == SDHCI_PRESENT_STATE)) {
+ /* Use wp_gpio here instead? */
+ val = readl(host->ioaddr + reg);
+ return val | SDHCI_WRITE_PROTECT;
+ }
+
+ return readl(host->ioaddr + reg);
+}
+
+static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
+{
+ if (unlikely(reg == SDHCI_HOST_VERSION)) {
+ /* Erratum: Version register is invalid in HW. */
+ return SDHCI_SPEC_200;
+ }
+
+ return readw(host->ioaddr + reg);
+}
+
+static void tegra_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
+{
+ /* Seems like we're getting spurious timeout and crc errors, so
+ * disable signalling of them. In case of real errors software
+ * timers should take care of eventually detecting them.
+ */
+ if (unlikely(reg == SDHCI_SIGNAL_ENABLE))
+ val &= ~(SDHCI_INT_TIMEOUT|SDHCI_INT_CRC);
+
+ writel(val, host->ioaddr + reg);
+
+ if (unlikely(reg == SDHCI_INT_ENABLE)) {
+ /* Erratum: Must enable block gap interrupt detection */
+ u8 gap_ctrl = readb(host->ioaddr + SDHCI_BLOCK_GAP_CONTROL);
+ if (val & SDHCI_INT_CARD_INT)
+ gap_ctrl |= 0x8;
+ else
+ gap_ctrl &= ~0x8;
+ writeb(gap_ctrl, host->ioaddr + SDHCI_BLOCK_GAP_CONTROL);
+ }
+}
+
+static unsigned int tegra_sdhci_get_ro(struct sdhci_host *sdhci)
+{
+ struct platform_device *pdev = to_platform_device(mmc_dev(sdhci->mmc));
+ struct tegra_sdhci_platform_data *plat;
+
+ plat = pdev->dev.platform_data;
+
+ if (!gpio_is_valid(plat->wp_gpio))
+ return -1;
+
+ return gpio_get_value(plat->wp_gpio);
+}
+
+static irqreturn_t carddetect_irq(int irq, void *data)
+{
+ struct sdhci_host *sdhost = (struct sdhci_host *)data;
+
+ tasklet_schedule(&sdhost->card_tasklet);
+ return IRQ_HANDLED;
+};
+
+static int tegra_sdhci_8bit(struct sdhci_host *host, int bus_width)
+{
+ struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
+ struct tegra_sdhci_platform_data *plat;
+ u32 ctrl;
+
+ plat = pdev->dev.platform_data;
+
+ ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
+ if (plat->is_8bit && bus_width == MMC_BUS_WIDTH_8) {
+ ctrl &= ~SDHCI_CTRL_4BITBUS;
+ ctrl |= SDHCI_CTRL_8BITBUS;
+ } else {
+ ctrl &= ~SDHCI_CTRL_8BITBUS;
+ if (bus_width == MMC_BUS_WIDTH_4)
+ ctrl |= SDHCI_CTRL_4BITBUS;
+ else
+ ctrl &= ~SDHCI_CTRL_4BITBUS;
+ }
+ sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
+ return 0;
+}
+
+
+static int tegra_sdhci_pltfm_init(struct sdhci_host *host,
+ struct sdhci_pltfm_data *pdata)
+{
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
+ struct tegra_sdhci_platform_data *plat;
+ struct clk *clk;
+ int rc;
+
+ plat = pdev->dev.platform_data;
+ if (plat == NULL) {
+ dev_err(mmc_dev(host->mmc), "missing platform data\n");
+ return -ENXIO;
+ }
+
+ if (gpio_is_valid(plat->power_gpio)) {
+ rc = gpio_request(plat->power_gpio, "sdhci_power");
+ if (rc) {
+ dev_err(mmc_dev(host->mmc),
+ "failed to allocate power gpio\n");
+ goto out;
+ }
+ tegra_gpio_enable(plat->power_gpio);
+ gpio_direction_output(plat->power_gpio, 1);
+ }
+
+ if (gpio_is_valid(plat->cd_gpio)) {
+ rc = gpio_request(plat->cd_gpio, "sdhci_cd");
+ if (rc) {
+ dev_err(mmc_dev(host->mmc),
+ "failed to allocate cd gpio\n");
+ goto out_power;
+ }
+ tegra_gpio_enable(plat->cd_gpio);
+ gpio_direction_input(plat->cd_gpio);
+
+ rc = request_irq(gpio_to_irq(plat->cd_gpio), carddetect_irq,
+ IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
+ mmc_hostname(host->mmc), host);
+
+ if (rc) {
+ dev_err(mmc_dev(host->mmc), "request irq error\n");
+ goto out_cd;
+ }
+
+ }
+
+ if (gpio_is_valid(plat->wp_gpio)) {
+ rc = gpio_request(plat->wp_gpio, "sdhci_wp");
+ if (rc) {
+ dev_err(mmc_dev(host->mmc),
+ "failed to allocate wp gpio\n");
+ goto out_cd;
+ }
+ tegra_gpio_enable(plat->wp_gpio);
+ gpio_direction_input(plat->wp_gpio);
+ }
+
+ clk = clk_get(mmc_dev(host->mmc), NULL);
+ if (IS_ERR(clk)) {
+ dev_err(mmc_dev(host->mmc), "clk err\n");
+ rc = PTR_ERR(clk);
+ goto out_wp;
+ }
+ clk_enable(clk);
+ pltfm_host->clk = clk;
+
+ if (plat->is_8bit)
+ host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+
+ return 0;
+
+out_wp:
+ if (gpio_is_valid(plat->wp_gpio)) {
+ tegra_gpio_disable(plat->wp_gpio);
+ gpio_free(plat->wp_gpio);
+ }
+
+out_cd:
+ if (gpio_is_valid(plat->cd_gpio)) {
+ tegra_gpio_disable(plat->cd_gpio);
+ gpio_free(plat->cd_gpio);
+ }
+
+out_power:
+ if (gpio_is_valid(plat->power_gpio)) {
+ tegra_gpio_disable(plat->power_gpio);
+ gpio_free(plat->power_gpio);
+ }
+
+out:
+ return rc;
+}
+
+static void tegra_sdhci_pltfm_exit(struct sdhci_host *host)
+{
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc));
+ struct tegra_sdhci_platform_data *plat;
+
+ plat = pdev->dev.platform_data;
+
+ if (gpio_is_valid(plat->wp_gpio)) {
+ tegra_gpio_disable(plat->wp_gpio);
+ gpio_free(plat->wp_gpio);
+ }
+
+ if (gpio_is_valid(plat->cd_gpio)) {
+ tegra_gpio_disable(plat->cd_gpio);
+ gpio_free(plat->cd_gpio);
+ }
+
+ if (gpio_is_valid(plat->power_gpio)) {
+ tegra_gpio_disable(plat->power_gpio);
+ gpio_free(plat->power_gpio);
+ }
+
+ clk_disable(pltfm_host->clk);
+ clk_put(pltfm_host->clk);
+}
+
+static struct sdhci_ops tegra_sdhci_ops = {
+ .get_ro = tegra_sdhci_get_ro,
+ .read_l = tegra_sdhci_readl,
+ .read_w = tegra_sdhci_readw,
+ .write_l = tegra_sdhci_writel,
+ .platform_8bit_width = tegra_sdhci_8bit,
+};
+
+struct sdhci_pltfm_data sdhci_tegra_pdata = {
+ .quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
+ SDHCI_QUIRK_SINGLE_POWER_WRITE |
+ SDHCI_QUIRK_NO_HISPD_BIT |
+ SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC,
+ .ops = &tegra_sdhci_ops,
+ .init = tegra_sdhci_pltfm_init,
+ .exit = tegra_sdhci_pltfm_exit,
+};
--
1.7.3.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs
2011-01-02 0:37 ` [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs Olof Johansson
@ 2011-01-02 5:43 ` Chris Ball
2011-01-02 6:12 ` Olof Johansson
0 siblings, 1 reply; 6+ messages in thread
From: Chris Ball @ 2011-01-02 5:43 UTC (permalink / raw)
To: Olof Johansson; +Cc: Wolfram Sang, linux-mmc, linux-tegra, Yvonne Yip
Hi Olof,
On Sat, Jan 01, 2011 at 06:37:33PM -0600, Olof Johansson wrote:
> SDHCI driver for Tegra. This driver plugs in as a new variant of
> sdhci-pltfm, using the platform data structure passed in to specify the
> GPIOs to use for card detect, write protect and card power enablement.
I've pushed this patchset to mmc-next for .38 now. Thanks! I removed
the Change-Id: tags from both commit messages, matching Linus' policy:
http://thread.gmane.org/gmane.linux.kernel/1075380.
Also:
> --- /dev/null
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -0,0 +1,257 @@
> +/*
> + * Copyright (C) 2010 The Chromium OS Authors <chromium-os-dev@chromium.org>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
As discussed on IRC, this is the first time this attribution line's been
used in mainline, so I'd like to hear more about whether The Chromium OS
Authors is actually a copyright-holding entity.
Thanks,
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs
2011-01-02 5:43 ` Chris Ball
@ 2011-01-02 6:12 ` Olof Johansson
0 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2011-01-02 6:12 UTC (permalink / raw)
To: Chris Ball; +Cc: Wolfram Sang, linux-mmc, linux-tegra, Yvonne Yip
On Sat, Jan 1, 2011 at 9:43 PM, Chris Ball <cjb@laptop.org> wrote:
> Hi Olof,
>
> On Sat, Jan 01, 2011 at 06:37:33PM -0600, Olof Johansson wrote:
>> SDHCI driver for Tegra. This driver plugs in as a new variant of
>> sdhci-pltfm, using the platform data structure passed in to specify the
>> GPIOs to use for card detect, write protect and card power enablement.
>
> I've pushed this patchset to mmc-next for .38 now. Thanks! I removed
> the Change-Id: tags from both commit messages, matching Linus' policy:
> http://thread.gmane.org/gmane.linux.kernel/1075380.
Crap, stupid repo -- I forgot to remove them by hand. Sorry about that.
> Also:
>
>> --- /dev/null
>> +++ b/drivers/mmc/host/sdhci-tegra.c
>> @@ -0,0 +1,257 @@
>> +/*
>> + * Copyright (C) 2010 The Chromium OS Authors <chromium-os-dev@chromium.org>
>> + *
>> + * This software is licensed under the terms of the GNU General Public
>> + * License version 2, as published by the Free Software Foundation, and
>> + * may be copied, distributed, and modified under those terms.
>
> As discussed on IRC, this is the first time this attribution line's been
> used in mainline, so I'd like to hear more about whether The Chromium OS
> Authors is actually a copyright-holding entity.
Yep, I'll follow up on this.
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors
2011-01-02 0:37 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Olof Johansson
2011-01-02 0:37 ` [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs Olof Johansson
@ 2011-01-03 6:25 ` Kyungmin Park
1 sibling, 0 replies; 6+ messages in thread
From: Kyungmin Park @ 2011-01-03 6:25 UTC (permalink / raw)
To: Olof Johansson
Cc: Chris Ball, Wolfram Sang, linux-mmc, linux-tegra,
정재훈
It's also valid as SDHCI at Samsung SoCs.
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
On Sun, Jan 2, 2011 at 9:37 AM, Olof Johansson <olof@lixom.net> wrote:
> Some controllers misparse segment length 0 as being 0, not 65536. Add
> a quirk to deal with it.
>
> Change-Id: I1422c9c605095addc133e844c66fc49f187dc17d
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
> drivers/mmc/host/sdhci.c | 10 +++++++---
> include/linux/mmc/sdhci.h | 2 ++
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index a25db426..c0094c1 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1928,10 +1928,14 @@ int sdhci_add_host(struct sdhci_host *host)
> * of bytes. When doing hardware scatter/gather, each entry cannot
> * be larger than 64 KiB though.
> */
> - if (host->flags & SDHCI_USE_ADMA)
> - mmc->max_seg_size = 65536;
> - else
> + if (host->flags & SDHCI_USE_ADMA) {
> + if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC)
> + mmc->max_seg_size = 65535;
> + else
> + mmc->max_seg_size = 65536;
> + } else {
> mmc->max_seg_size = mmc->max_req_size;
> + }
>
> /*
> * Maximum block size. This varies from controller to controller and
> diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
> index 1fdc673..dfb2106 100644
> --- a/include/linux/mmc/sdhci.h
> +++ b/include/linux/mmc/sdhci.h
> @@ -83,6 +83,8 @@ struct sdhci_host {
> #define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 (1<<28)
> /* Controller doesn't have HISPD bit field in HI-SPEED SD card */
> #define SDHCI_QUIRK_NO_HISPD_BIT (1<<29)
> +/* Controller treats ADMA descriptors with length 0000h incorrectly */
> +#define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC (1<<30)
>
> int irq; /* Device IRQ */
> void __iomem *ioaddr; /* Mapped address */
> --
> 1.7.3.GIT
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-03 6:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-02 0:32 [PATCH 0/2 v4] Add SDHCI driver for Tegra Olof Johansson
2011-01-02 0:37 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Olof Johansson
2011-01-02 0:37 ` [PATCH 2/2 v4] mmc: add sdhci-tegra driver for Tegra SoCs Olof Johansson
2011-01-02 5:43 ` Chris Ball
2011-01-02 6:12 ` Olof Johansson
2011-01-03 6:25 ` [PATCH 1/2 v4] sdhci: add quirk for max len ADMA descriptors Kyungmin Park
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox