| Message ID | 20240908102018.3711527-3-avri.altman@wdc.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add SDUC Support | expand |
On Sun, 8 Sept 2024 at 12:22, Avri Altman <avri.altman@wdc.com> wrote: > > SDUC memory addressing spans beyond 2TB and up to 128TB. Therefore, 38 > bits are required to access the entire memory space of all sectors. > Those extra 6 bits are to be carried by CMD22 prior of sending > read/write/erase commands: CMD17, CMD18, CMD24, CMD25, CMD32, and CMD33. > > CMD22 will carry the higher order 6 bits, and must precedes any of the > above commands even if it targets sector < 2TB. > > No error related to address or length is indicated in CMD22 but rather > in the read/write command itself. > > Tested-by: Ricky WU <ricky_wu@realtek.com> > Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> > Signed-off-by: Avri Altman <avri.altman@wdc.com> > --- > drivers/mmc/core/sd_ops.c | 16 ++++++++++++++++ > drivers/mmc/core/sd_ops.h | 1 + > include/linux/mmc/sd.h | 3 +++ > 3 files changed, 20 insertions(+) > > diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c > index f93c392040ae..bb83db85a689 100644 > --- a/drivers/mmc/core/sd_ops.c > +++ b/drivers/mmc/core/sd_ops.c > @@ -16,6 +16,7 @@ > #include <linux/mmc/sd.h> > > #include "core.h" > +#include "card.h" > #include "sd_ops.h" > #include "mmc_ops.h" > > @@ -188,6 +189,21 @@ int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr) > return 0; > } > > +int mmc_send_ext_addr(struct mmc_host *host, u32 addr) > +{ > + struct mmc_command cmd = { > + .opcode = SD_ADDR_EXT, > + .arg = addr, > + .flags = MMC_RSP_R1 | MMC_CMD_AC, > + }; > + > + if (!mmc_card_ult_capacity(host->card)) > + return 0; > + > + return mmc_wait_for_cmd(host, &cmd, 0); > +} > +EXPORT_SYMBOL_GPL(mmc_send_ext_addr); This doesn't need to be exported as it's only used by the core module. [...] Kind regards Uffe
> > +int mmc_send_ext_addr(struct mmc_host *host, u32 addr) { > > + struct mmc_command cmd = { > > + .opcode = SD_ADDR_EXT, > > + .arg = addr, > > + .flags = MMC_RSP_R1 | MMC_CMD_AC, > > + }; > > + > > + if (!mmc_card_ult_capacity(host->card)) > > + return 0; > > + > > + return mmc_wait_for_cmd(host, &cmd, 0); } > > +EXPORT_SYMBOL_GPL(mmc_send_ext_addr); > > This doesn't need to be exported as it's only used by the core module. I've got a kernel test robot warning on this in v1: https://www.spinics.net/lists/linux-mmc/msg81530.html Thanks, Avri > > [...] > > Kind regards > Uffe
On Thu, 3 Oct 2024 at 18:31, Avri Altman <Avri.Altman@wdc.com> wrote: > > > > +int mmc_send_ext_addr(struct mmc_host *host, u32 addr) { > > > + struct mmc_command cmd = { > > > + .opcode = SD_ADDR_EXT, > > > + .arg = addr, > > > + .flags = MMC_RSP_R1 | MMC_CMD_AC, > > > + }; > > > + > > > + if (!mmc_card_ult_capacity(host->card)) > > > + return 0; > > > + > > > + return mmc_wait_for_cmd(host, &cmd, 0); } > > > +EXPORT_SYMBOL_GPL(mmc_send_ext_addr); > > > > This doesn't need to be exported as it's only used by the core module. > I've got a kernel test robot warning on this in v1: > https://www.spinics.net/lists/linux-mmc/msg81530.html I don't recall how the code looked in v1. Probably there was a call to mmc_send_ext_addr() from the mmc block device driver that isn't there anymore, which seems very much correct to me. You can for sure drop the EXPORT_SYMBOL_GPL from here, it isn't needed. Kind regards Uffe
> On Thu, 3 Oct 2024 at 18:31, Avri Altman <Avri.Altman@wdc.com> wrote: > > > > > > +int mmc_send_ext_addr(struct mmc_host *host, u32 addr) { > > > > + struct mmc_command cmd = { > > > > + .opcode = SD_ADDR_EXT, > > > > + .arg = addr, > > > > + .flags = MMC_RSP_R1 | MMC_CMD_AC, > > > > + }; > > > > + > > > > + if (!mmc_card_ult_capacity(host->card)) > > > > + return 0; > > > > + > > > > + return mmc_wait_for_cmd(host, &cmd, 0); } > > > > +EXPORT_SYMBOL_GPL(mmc_send_ext_addr); > > > > > > This doesn't need to be exported as it's only used by the core module. > > I've got a kernel test robot warning on this in v1: > > https://www.spinics.net/lists/linux-mmc/msg81530.html > > I don't recall how the code looked in v1. Probably there was a call to > mmc_send_ext_addr() from the mmc block device driver that isn't there > anymore, which seems very much correct to me. > > You can for sure drop the EXPORT_SYMBOL_GPL from here, it isn't needed. OK. Thanks, Avri > > Kind regards > Uffe
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c index f93c392040ae..bb83db85a689 100644 --- a/drivers/mmc/core/sd_ops.c +++ b/drivers/mmc/core/sd_ops.c @@ -16,6 +16,7 @@ #include <linux/mmc/sd.h> #include "core.h" +#include "card.h" #include "sd_ops.h" #include "mmc_ops.h" @@ -188,6 +189,21 @@ int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr) return 0; } +int mmc_send_ext_addr(struct mmc_host *host, u32 addr) +{ + struct mmc_command cmd = { + .opcode = SD_ADDR_EXT, + .arg = addr, + .flags = MMC_RSP_R1 | MMC_CMD_AC, + }; + + if (!mmc_card_ult_capacity(host->card)) + return 0; + + return mmc_wait_for_cmd(host, &cmd, 0); +} +EXPORT_SYMBOL_GPL(mmc_send_ext_addr); + static int __mmc_send_if_cond(struct mmc_host *host, u32 ocr, u8 pcie_bits, u32 *resp) { diff --git a/drivers/mmc/core/sd_ops.h b/drivers/mmc/core/sd_ops.h index 7667fc223b74..fd3f10b9cf86 100644 --- a/drivers/mmc/core/sd_ops.h +++ b/drivers/mmc/core/sd_ops.h @@ -21,6 +21,7 @@ int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca); int mmc_app_send_scr(struct mmc_card *card); int mmc_app_sd_status(struct mmc_card *card, void *ssr); int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card); +int mmc_send_ext_addr(struct mmc_host *host, u32 addr); #endif diff --git a/include/linux/mmc/sd.h b/include/linux/mmc/sd.h index 865cc0ca8543..af5fc70e09a2 100644 --- a/include/linux/mmc/sd.h +++ b/include/linux/mmc/sd.h @@ -15,6 +15,9 @@ #define SD_SEND_IF_COND 8 /* bcr [11:0] See below R7 */ #define SD_SWITCH_VOLTAGE 11 /* ac R1 */ +/* Class 2 */ +#define SD_ADDR_EXT 22 /* ac [5:0] R1 */ + /* class 10 */ #define SD_SWITCH 6 /* adtc [31:0] See below R1 */