public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] MMC fixes for 3.4-rc2
@ 2012-04-06 19:35 Chris Ball
  2012-04-07  0:22 ` Linus Torvalds
  2012-04-09  5:36 ` Hebbar, Gururaja
  0 siblings, 2 replies; 5+ messages in thread
From: Chris Ball @ 2012-04-06 19:35 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-mmc, linux-kernel

Hi Linus,

Please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus

to receive MMC fixes for 3.4-rc2.  I've signed an "mmc-fixes-for-3.4-rc2"
tag.  There are no merge conflicts, and the patches have been tested in
linux-next.  Thanks.

The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:

  Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus

for you to fetch changes up to 3bdc9ba892d6a294d16e9e6e0c4041926aa3d58c:

  mmc: use really long write timeout to deal with crappy cards (2012-04-05 20:32:34 -0400)

----------------------------------------------------------------
MMC fixes for 3.4-rc2:
 The major fixes here are:
  * Disable use of MSI in sdhci-pci, which caused multiple chipsets to
    stop working in 3.4-rc1.  I'll wait to turn this on again until we
    have a chipset whitelist for it.
  * Fix a libertas SDIO powered-resume regression introduced in 3.3;
    thanks to Neil Brown and Rafael Wysocki for this fix.
  * Fix module reloading on omap_hsmmc.
  * Stop trusting the spec/card's specified maximum data timeout length,
    and use three seconds instead.  Previously we used 300ms.

 Also cleanups and fixes for s3c, atmel, sh_mmcif and omap_hsmmc.

----------------------------------------------------------------
Al Cooper (1):
      mmc: Prevent 1.8V switch for SD hosts that don't support UHS modes.

Alf Høgemark (1):
      mmc: sdhci-dove: Fix compile error by including module.h

Balaji T K (3):
      mmc: omap_hsmmc: use runtime put sync in probe error patch
      mmc: omap_hsmmc: context save after enabling runtime pm
      mmc: omap_hsmmc: fix module re-insertion

Chris Ball (2):
      Revert "mmc: sdhci-pci: add quirks for broken MSI on O2Micro controllers"
      Revert "mmc: sdhci-pci: Add MSI support"

Felipe Balbi (3):
      mmc: omap_hsmmc: trivial cleanups
      mmc: omap_hsmmc: make it behave well as a module
      mmc: omap_hsmmc: convert to module_platform_driver

Julia Lawall (1):
      mmc: sdhci-s3c: use devm_ functions

Ludovic Desroches (3):
      mmc: atmel-mci: correct data timeout computation
      mmc: atmel-mci: r/w proof capability only available since v2xx
      mmc: atmel-mci: add support for odd clock dividers

Manuel Lauss (1):
      mmc: sdhci-pci: add quirks for broken MSI on O2Micro controllers

Mark Brown (2):
      mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend
      mmc: sdhci-s3c: Enable runtime power management

Paul Walmsley (1):
      mmc: use really long write timeout to deal with crappy cards

Rafael J. Wysocki (1):
      mmc: sdio: Use empty system suspend/resume callbacks at the bus level

Simon Horman (3):
      mmc: sh_mmcif: double clock speed
      mmc: sh_mmcif: mmc->f_max should be half of the bus clock
      mmc: sh_mmcif: Simplify calculation of mmc->f_min

Subhash Jadavani (2):
      mmc: bus: print bus speed mode of UHS-I card
      mmc: core: fix power class selection

Thomas Abraham (3):
      mmc: sdhci-s3c: Remove usage of clk_type member in platform data
      mmc: sdhci-s3c: derive transfer width host cap from max_width in platdata
      mmc: sdhci-s3c: Keep a copy of platform data and use it

Ulf Hansson (1):
      mmc: block: Remove use of mmc_blk_set_blksize

 drivers/mmc/card/block.c          |   27 +------
 drivers/mmc/core/bus.c            |   17 +++-
 drivers/mmc/core/core.c           |   10 ++-
 drivers/mmc/core/mmc.c            |   30 ++++---
 drivers/mmc/core/sdio_bus.c       |   12 ++-
 drivers/mmc/host/atmel-mci-regs.h |    1 +
 drivers/mmc/host/atmel-mci.c      |   55 ++++++++----
 drivers/mmc/host/omap_hsmmc.c     |  181 ++++++++++++++++---------------------
 drivers/mmc/host/sdhci-dove.c     |    1 +
 drivers/mmc/host/sdhci-pci.c      |    6 --
 drivers/mmc/host/sdhci-s3c.c      |  159 +++++++++++++++++++++++++-------
 drivers/mmc/host/sdhci.c          |    5 +-
 drivers/mmc/host/sh_mmcif.c       |   13 +--
 13 files changed, 299 insertions(+), 218 deletions(-)

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT PULL] MMC fixes for 3.4-rc2
  2012-04-06 19:35 [GIT PULL] MMC fixes for 3.4-rc2 Chris Ball
@ 2012-04-07  0:22 ` Linus Torvalds
  2012-04-07  0:51   ` Chris Ball
  2012-04-09  5:36 ` Hebbar, Gururaja
  1 sibling, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2012-04-07  0:22 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-mmc, linux-kernel

On Fri, Apr 6, 2012 at 12:35 PM, Chris Ball <cjb@laptop.org> wrote:
>
> Please pull from:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus
>
> to receive MMC fixes for 3.4-rc2.  I've signed an "mmc-fixes-for-3.4-rc2"
> tag.

Please just ask my to pull the tag directly, don't say "please pull
this branch", and then add "oh, but there's this tag also".

I already did the "cut-and-paste" for the pull, and then I realized
that I'm not seeing the message that your email implied was there, and
then I noticed that you talked about the tag separately.

That just messes everything up. Don't even bother mentioning the
worthless branch. The tag has everything the branch has, _and_ the
message.

So just ask me to pull it, with a

  Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
mmc-fixes-for-3.4-rc2

rather than make it unnecessarily more complicated and error-prone.

                   Linus

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT PULL] MMC fixes for 3.4-rc2
  2012-04-07  0:22 ` Linus Torvalds
@ 2012-04-07  0:51   ` Chris Ball
  0 siblings, 0 replies; 5+ messages in thread
From: Chris Ball @ 2012-04-07  0:51 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-mmc, linux-kernel

Hi Linus,

On Fri, Apr 06 2012, Linus Torvalds wrote:
> On Fri, Apr 6, 2012 at 12:35 PM, Chris Ball <cjb@laptop.org> wrote:
>>
>> Please pull from:
>>
>>  git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus
>>
>> to receive MMC fixes for 3.4-rc2.  I've signed an "mmc-fixes-for-3.4-rc2"
>> tag.
>
> Please just ask my to pull the tag directly, don't say "please pull
> this branch", and then add "oh, but there's this tag also".
>
> I already did the "cut-and-paste" for the pull, and then I realized
> that I'm not seeing the message that your email implied was there, and
> then I noticed that you talked about the tag separately.
>
> That just messes everything up. Don't even bother mentioning the
> worthless branch. The tag has everything the branch has, _and_ the
> message.
>
> So just ask me to pull it, with a
>
>   Please pull from
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
> mmc-fixes-for-3.4-rc2
>
> rather than make it unnecessarily more complicated and error-prone.

I see, sorry.  I'll send just the tag from now on.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [GIT PULL] MMC fixes for 3.4-rc2
  2012-04-06 19:35 [GIT PULL] MMC fixes for 3.4-rc2 Chris Ball
  2012-04-07  0:22 ` Linus Torvalds
@ 2012-04-09  5:36 ` Hebbar, Gururaja
  2012-04-09  5:55   ` Chris Ball
  1 sibling, 1 reply; 5+ messages in thread
From: Hebbar, Gururaja @ 2012-04-09  5:36 UTC (permalink / raw)
  To: Chris Ball
  Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
	chuanxiao.dong@intel.com, rjw@sisk.pl

Hi,

Is the pull already completed?

If not can you add the recent mmc suspend/resume fix patch .

http://www.spinics.net/lists/linux-pm/msg27090.html

This is actually a fix (for bug) in mmc/sd suspend/resume path.
This fixed a hard-to-find MMC suspend/resume while cp in progress race 
condition reported at below link. It was on AM335x Platform.

http://www.mail-archive.com/linux-omap <at> vger.kernel.org/msg65425.html
	

On Sat, Apr 07, 2012 at 01:05:34, Chris Ball wrote:
> Hi Linus,
> 
> Please pull from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus
> 
> to receive MMC fixes for 3.4-rc2.  I've signed an "mmc-fixes-for-3.4-rc2"
> tag.  There are no merge conflicts, and the patches have been tested in
> linux-next.  Thanks.
> 
> The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
> 
>   Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git for-linus
> 
> for you to fetch changes up to 3bdc9ba892d6a294d16e9e6e0c4041926aa3d58c:
> 
>   mmc: use really long write timeout to deal with crappy cards (2012-04-05 20:32:34 -0400)
> 
> ----------------------------------------------------------------
> MMC fixes for 3.4-rc2:
>  The major fixes here are:
>   * Disable use of MSI in sdhci-pci, which caused multiple chipsets to
>     stop working in 3.4-rc1.  I'll wait to turn this on again until we
>     have a chipset whitelist for it.
>   * Fix a libertas SDIO powered-resume regression introduced in 3.3;
>     thanks to Neil Brown and Rafael Wysocki for this fix.
>   * Fix module reloading on omap_hsmmc.
>   * Stop trusting the spec/card's specified maximum data timeout length,
>     and use three seconds instead.  Previously we used 300ms.
> 
>  Also cleanups and fixes for s3c, atmel, sh_mmcif and omap_hsmmc.
> 
> ----------------------------------------------------------------
> Al Cooper (1):
>       mmc: Prevent 1.8V switch for SD hosts that don't support UHS modes.
> 
> Alf Høgemark (1):
>       mmc: sdhci-dove: Fix compile error by including module.h
> 
> Balaji T K (3):
>       mmc: omap_hsmmc: use runtime put sync in probe error patch
>       mmc: omap_hsmmc: context save after enabling runtime pm
>       mmc: omap_hsmmc: fix module re-insertion
> 
> Chris Ball (2):
>       Revert "mmc: sdhci-pci: add quirks for broken MSI on O2Micro controllers"
>       Revert "mmc: sdhci-pci: Add MSI support"
> 
> Felipe Balbi (3):
>       mmc: omap_hsmmc: trivial cleanups
>       mmc: omap_hsmmc: make it behave well as a module
>       mmc: omap_hsmmc: convert to module_platform_driver
> 
> Julia Lawall (1):
>       mmc: sdhci-s3c: use devm_ functions
> 
> Ludovic Desroches (3):
>       mmc: atmel-mci: correct data timeout computation
>       mmc: atmel-mci: r/w proof capability only available since v2xx
>       mmc: atmel-mci: add support for odd clock dividers
> 
> Manuel Lauss (1):
>       mmc: sdhci-pci: add quirks for broken MSI on O2Micro controllers
> 
> Mark Brown (2):
>       mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend
>       mmc: sdhci-s3c: Enable runtime power management
> 
> Paul Walmsley (1):
>       mmc: use really long write timeout to deal with crappy cards
> 
> Rafael J. Wysocki (1):
>       mmc: sdio: Use empty system suspend/resume callbacks at the bus level
> 
> Simon Horman (3):
>       mmc: sh_mmcif: double clock speed
>       mmc: sh_mmcif: mmc->f_max should be half of the bus clock
>       mmc: sh_mmcif: Simplify calculation of mmc->f_min
> 
> Subhash Jadavani (2):
>       mmc: bus: print bus speed mode of UHS-I card
>       mmc: core: fix power class selection
> 
> Thomas Abraham (3):
>       mmc: sdhci-s3c: Remove usage of clk_type member in platform data
>       mmc: sdhci-s3c: derive transfer width host cap from max_width in platdata
>       mmc: sdhci-s3c: Keep a copy of platform data and use it
> 
> Ulf Hansson (1):
>       mmc: block: Remove use of mmc_blk_set_blksize
> 
>  drivers/mmc/card/block.c          |   27 +------
>  drivers/mmc/core/bus.c            |   17 +++-
>  drivers/mmc/core/core.c           |   10 ++-
>  drivers/mmc/core/mmc.c            |   30 ++++---
>  drivers/mmc/core/sdio_bus.c       |   12 ++-
>  drivers/mmc/host/atmel-mci-regs.h |    1 +
>  drivers/mmc/host/atmel-mci.c      |   55 ++++++++----
>  drivers/mmc/host/omap_hsmmc.c     |  181 ++++++++++++++++---------------------
>  drivers/mmc/host/sdhci-dove.c     |    1 +
>  drivers/mmc/host/sdhci-pci.c      |    6 --
>  drivers/mmc/host/sdhci-s3c.c      |  159 +++++++++++++++++++++++++-------
>  drivers/mmc/host/sdhci.c          |    5 +-
>  drivers/mmc/host/sh_mmcif.c       |   13 +--
>  13 files changed, 299 insertions(+), 218 deletions(-)
> 
> -- 
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child
> --
> 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
> 

Thanks & regards,
Gururaja

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT PULL] MMC fixes for 3.4-rc2
  2012-04-09  5:36 ` Hebbar, Gururaja
@ 2012-04-09  5:55   ` Chris Ball
  0 siblings, 0 replies; 5+ messages in thread
From: Chris Ball @ 2012-04-09  5:55 UTC (permalink / raw)
  To: Hebbar, Gururaja
  Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
	chuanxiao.dong@intel.com, rjw@sisk.pl

Hi,

On Mon, Apr 09 2012, Hebbar, Gururaja wrote:
> Hi,
>
> Is the pull already completed?

Yes, and -rc2 has already been released.

> If not can you add the recent mmc suspend/resume fix patch .
>
> http://www.spinics.net/lists/linux-pm/msg27090.html
>
> This is actually a fix (for bug) in mmc/sd suspend/resume path.
> This fixed a hard-to-find MMC suspend/resume while cp in progress race 
> condition reported at below link. It was on AM335x Platform.
>
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg65425.html

Okay, thanks for testing.  I'll send the fix to Linus once it's finished
review and further testing.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-04-09  5:56 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-06 19:35 [GIT PULL] MMC fixes for 3.4-rc2 Chris Ball
2012-04-07  0:22 ` Linus Torvalds
2012-04-07  0:51   ` Chris Ball
2012-04-09  5:36 ` Hebbar, Gururaja
2012-04-09  5:55   ` Chris Ball

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox