| Message ID | 20190322154425.3852517-18-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | candidates from spreadtrum 4.4 product kernel | expand |
On Fri, Mar 22, 2019 at 04:44:08PM +0100, Arnd Bergmann wrote: > From: Ziyuan Xu <xzy.xu@rock-chips.com> > > Per spec, block size should always be 512 bytes for dual rate mode, > so any attempts to switch the block size under dual rate mode should > be neglected. > > Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > (cherry picked from commit 1712c9373f98ae8ed41599a8d7841a6fba29c264) > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/mmc/core/core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > index df074f8c7cb7..3e17268b9994 100644 > --- a/drivers/mmc/core/core.c > +++ b/drivers/mmc/core/core.c > @@ -2406,7 +2406,8 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen) > { > struct mmc_command cmd = {0}; > > - if (mmc_card_blockaddr(card) || mmc_card_ddr52(card)) > + if (mmc_card_blockaddr(card) || mmc_card_ddr52(card) || > + mmc_card_hs400(card) || mmc_card_hs400es(card)) This breaks the build, there is no mmc_card_hs400es() call in 4.4.y. How did this build for you? greg k-h
On Tue, Mar 26, 2019 at 2:27 AM Greg KH <gregkh@linuxfoundation.org> wrote: > > On Fri, Mar 22, 2019 at 04:44:08PM +0100, Arnd Bergmann wrote: > > From: Ziyuan Xu <xzy.xu@rock-chips.com> > > > > Per spec, block size should always be 512 bytes for dual rate mode, > > so any attempts to switch the block size under dual rate mode should > > be neglected. > > > > Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> > > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > (cherry picked from commit 1712c9373f98ae8ed41599a8d7841a6fba29c264) > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/mmc/core/core.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > > index df074f8c7cb7..3e17268b9994 100644 > > --- a/drivers/mmc/core/core.c > > +++ b/drivers/mmc/core/core.c > > @@ -2406,7 +2406,8 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen) > > { > > struct mmc_command cmd = {0}; > > > > - if (mmc_card_blockaddr(card) || mmc_card_ddr52(card)) > > + if (mmc_card_blockaddr(card) || mmc_card_ddr52(card) || > > + mmc_card_hs400(card) || mmc_card_hs400es(card)) > > This breaks the build, there is no mmc_card_hs400es() call in 4.4.y. > > How did this build for you? I had a larger set of backported patches and then dropped others that did not look like stable material, but then did not rebuild again afterwards. I'll make sure to do that next time. Arnd
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index df074f8c7cb7..3e17268b9994 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2406,7 +2406,8 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen) { struct mmc_command cmd = {0}; - if (mmc_card_blockaddr(card) || mmc_card_ddr52(card)) + if (mmc_card_blockaddr(card) || mmc_card_ddr52(card) || + mmc_card_hs400(card) || mmc_card_hs400es(card)) return 0; cmd.opcode = MMC_SET_BLOCKLEN;