Re: linux-next: manual merge of the spi-mb tree with the mmc tree
On 09/05/2012 06:15 AM, Stephen Rothwell wrote:
Hi Mark,
Today's linux-next merge of the spi-mb tree got a conflict in
drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 ("mmc: mxs-mmc:
fix deadlock caused by recursion loop") from the mmc tree and commit
829c1bf40b92 ("mmc: spi: Pull out parts shared between MMC and SPI") from
the spi-mb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
Reviewed and tested. Looks good.
Lauri
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the spi-mb tree with the mmc tree
On 09/05/2012 06:15 AM, Stephen Rothwell wrote: Hi Mark, Today's linux-next merge of the spi-mb tree got a conflict in drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 (mmc: mxs-mmc: fix deadlock caused by recursion loop) from the mmc tree and commit 829c1bf40b92 (mmc: spi: Pull out parts shared between MMC and SPI) from the spi-mb tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Reviewed and tested. Looks good. Lauri -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the spi-mb tree with the mmc tree
Dear Stephen Rothwell,
> Hi Mark,
>
> Today's linux-next merge of the spi-mb tree got a conflict in
> drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 ("mmc: mxs-mmc:
> fix deadlock caused by recursion loop") from the mmc tree and commit
> 829c1bf40b92 ("mmc: spi: Pull out parts shared between MMC and SPI") from
> the spi-mb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
On a quick glance, it seems correct. Thank you!
Best regards,
Marek Vasut
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the spi-mb tree with the mmc tree
Hi Mark,
Today's linux-next merge of the spi-mb tree got a conflict in
drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 ("mmc: mxs-mmc:
fix deadlock caused by recursion loop") from the mmc tree and commit
829c1bf40b92 ("mmc: spi: Pull out parts shared between MMC and SPI") from
the spi-mb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/mmc/host/mxs-mmc.c
index ad3fcea,4da9966..000
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@@ -281,12 -193,10 +193,12 @@@ static irqreturn_t mxs_mmc_irq_handler(
spin_lock(>lock);
- stat = readl(host->base + HW_SSP_CTRL1(host));
+ stat = readl(ssp->base + HW_SSP_CTRL1(ssp));
writel(stat & MXS_MMC_IRQ_BITS,
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
+ spin_unlock(>lock);
+
if ((stat & BM_SSP_CTRL1_SDIO_IRQ) && (stat & BM_SSP_CTRL1_SDIO_IRQ_EN))
mmc_signal_sdio_irq(host->mmc);
@@@ -641,22 -523,22 +523,22 @@@ static void mxs_mmc_enable_sdio_irq(str
if (enable) {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
- host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
+ ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
-
- if (readl(ssp->base + HW_SSP_STATUS(ssp)) &
- BM_SSP_STATUS_SDIO_IRQ)
- mmc_signal_sdio_irq(host->mmc);
-
} else {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
- host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
+ ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
}
spin_unlock_irqrestore(>lock, flags);
+
- if (enable && readl(host->base + HW_SSP_STATUS(host)) &
++ if (enable && readl(ssp->base + HW_SSP_STATUS(ssp)) &
+ BM_SSP_STATUS_SDIO_IRQ)
+ mmc_signal_sdio_irq(host->mmc);
+
}
static const struct mmc_host_ops mxs_mmc_ops = {
pgpCPw2DDq4Sn.pgp
Description: PGP signature
linux-next: manual merge of the spi-mb tree with the mmc tree
Hi Mark,
Today's linux-next merge of the spi-mb tree got a conflict in
drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 (mmc: mxs-mmc:
fix deadlock caused by recursion loop) from the mmc tree and commit
829c1bf40b92 (mmc: spi: Pull out parts shared between MMC and SPI) from
the spi-mb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/mmc/host/mxs-mmc.c
index ad3fcea,4da9966..000
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@@ -281,12 -193,10 +193,12 @@@ static irqreturn_t mxs_mmc_irq_handler(
spin_lock(host-lock);
- stat = readl(host-base + HW_SSP_CTRL1(host));
+ stat = readl(ssp-base + HW_SSP_CTRL1(ssp));
writel(stat MXS_MMC_IRQ_BITS,
- host-base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+ ssp-base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
+ spin_unlock(host-lock);
+
if ((stat BM_SSP_CTRL1_SDIO_IRQ) (stat BM_SSP_CTRL1_SDIO_IRQ_EN))
mmc_signal_sdio_irq(host-mmc);
@@@ -641,22 -523,22 +523,22 @@@ static void mxs_mmc_enable_sdio_irq(str
if (enable) {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
- host-base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
+ ssp-base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host-base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
+ ssp-base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
-
- if (readl(ssp-base + HW_SSP_STATUS(ssp))
- BM_SSP_STATUS_SDIO_IRQ)
- mmc_signal_sdio_irq(host-mmc);
-
} else {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
- host-base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
+ ssp-base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host-base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+ ssp-base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
}
spin_unlock_irqrestore(host-lock, flags);
+
- if (enable readl(host-base + HW_SSP_STATUS(host))
++ if (enable readl(ssp-base + HW_SSP_STATUS(ssp))
+ BM_SSP_STATUS_SDIO_IRQ)
+ mmc_signal_sdio_irq(host-mmc);
+
}
static const struct mmc_host_ops mxs_mmc_ops = {
pgpCPw2DDq4Sn.pgp
Description: PGP signature
Re: linux-next: manual merge of the spi-mb tree with the mmc tree
Dear Stephen Rothwell, Hi Mark, Today's linux-next merge of the spi-mb tree got a conflict in drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 (mmc: mxs-mmc: fix deadlock caused by recursion loop) from the mmc tree and commit 829c1bf40b92 (mmc: spi: Pull out parts shared between MMC and SPI) from the spi-mb tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). On a quick glance, it seems correct. Thank you! Best regards, Marek Vasut -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
