| Message ID | 1500630584-22852-4-git-send-email-adrian.hunter@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21 July 2017 at 11:49, Adrian Hunter <adrian.hunter@intel.com> wrote: > Add CQE host operations, capabilities, and host members. I think adding these new interfaces deserves a bit more descriptive changelog. > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> > --- > include/linux/mmc/host.h | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h > index ebd1cebbef0c..4dd7ada9b4b9 100644 > --- a/include/linux/mmc/host.h > +++ b/include/linux/mmc/host.h > @@ -162,6 +162,19 @@ struct mmc_host_ops { > unsigned int direction, int blk_size); > }; > > +struct mmc_cqe_ops { Could you please add a small comment to each new callback. Even if the names gives a good hint on they are used, some additional information would be nice. > + int (*cqe_enable)(struct mmc_host *host, struct mmc_card *card); > + void (*cqe_disable)(struct mmc_host *host); > + int (*cqe_request)(struct mmc_host *host, struct mmc_request *mrq); > + void (*cqe_post_req)(struct mmc_host *host, struct mmc_request *mrq); > + void (*cqe_off)(struct mmc_host *host); What differs between ->cqe_off() and ->cqe_disable()? Do we need both? > + int (*cqe_wait_for_idle)(struct mmc_host *host); The name sounds like you will poll the host to understand when the card becomes idle. Is that so? Then when is this needed? > + bool (*cqe_timeout)(struct mmc_host *host, struct mmc_request *mrq, > + bool *recovery_needed); > + void (*cqe_recovery_start)(struct mmc_host *host); > + void (*cqe_recovery_finish)(struct mmc_host *host); > +}; > + > struct mmc_async_req { > /* active mmc request */ > struct mmc_request *mrq; > @@ -307,6 +320,8 @@ struct mmc_host { > #define MMC_CAP2_HS400_ES (1 << 20) /* Host supports enhanced strobe */ > #define MMC_CAP2_NO_SD (1 << 21) /* Do not send SD commands during initialization */ > #define MMC_CAP2_NO_MMC (1 << 22) /* Do not send (e)MMC commands during initialization */ > +#define MMC_CAP2_CQE (1 << 23) /* Has eMMC command queue engine */ > +#define MMC_CAP2_CQE_DCMD (1 << 24) /* CQE can issue a direct command */ > > mmc_pm_flag_t pm_caps; /* supported pm features */ > > @@ -393,6 +408,15 @@ struct mmc_host { > int dsr_req; /* DSR value is valid */ > u32 dsr; /* optional driver stage (DSR) value */ > > + /* Command Queue Engine (CQE) support */ > + const struct mmc_cqe_ops *cqe_ops; > + void *cqe_private; > + void (*cqe_recovery_notifier)(struct mmc_host *, > + struct mmc_request *); Please add a comment here to understand how this callback is going to be used. > + int cqe_qdepth; > + bool cqe_enabled; > + bool cqe_on; > + > unsigned long private[0] ____cacheline_aligned; > }; > > -- > 1.9.1 > Kind regards Uffe -- 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
On 07/08/17 16:55, Ulf Hansson wrote: > On 21 July 2017 at 11:49, Adrian Hunter <adrian.hunter@intel.com> wrote: >> Add CQE host operations, capabilities, and host members. > > I think adding these new interfaces deserves a bit more descriptive changelog. OK > >> >> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> >> --- >> include/linux/mmc/host.h | 24 ++++++++++++++++++++++++ >> 1 file changed, 24 insertions(+) >> >> diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h >> index ebd1cebbef0c..4dd7ada9b4b9 100644 >> --- a/include/linux/mmc/host.h >> +++ b/include/linux/mmc/host.h >> @@ -162,6 +162,19 @@ struct mmc_host_ops { >> unsigned int direction, int blk_size); >> }; >> >> +struct mmc_cqe_ops { > > Could you please add a small comment to each new callback. Even if the > names gives a good hint on they are used, some additional information > would be nice. > >> + int (*cqe_enable)(struct mmc_host *host, struct mmc_card *card); >> + void (*cqe_disable)(struct mmc_host *host); >> + int (*cqe_request)(struct mmc_host *host, struct mmc_request *mrq); >> + void (*cqe_post_req)(struct mmc_host *host, struct mmc_request *mrq); >> + void (*cqe_off)(struct mmc_host *host); > > What differs between ->cqe_off() and ->cqe_disable()? Do we need both? Yes we need both. CQE must be set up, which is what ->cqe_enable() and ->cqe_disable() take care of. But CQE can only process read / write requests, so it must be "halted" (in CQHCI terminology) to allow the host controller to send other commands (like discards and flushes). So ->cqe_off() switches from CQE mode to legacy mode. There is not a ->cqe_on() because we can simply let the ->cqe_request() path do that. We could let the host controller do ->cqe_off() too but it is simpler if the core does it. > >> + int (*cqe_wait_for_idle)(struct mmc_host *host); > > The name sounds like you will poll the host to understand when the > card becomes idle. > > Is that so? Then when is this needed? No, it is not to do with the card. It is to wait for the CQE to become idle. As I mentioned above, we have to ->cqe_off() to send non-read/write commands but that won't work if CQE is busy. We have to wait for CQE to become idle and handle any errors that might result from its ongoing requests, before we start other commands. > >> + bool (*cqe_timeout)(struct mmc_host *host, struct mmc_request *mrq, >> + bool *recovery_needed); >> + void (*cqe_recovery_start)(struct mmc_host *host); >> + void (*cqe_recovery_finish)(struct mmc_host *host); >> +}; >> + >> struct mmc_async_req { >> /* active mmc request */ >> struct mmc_request *mrq; >> @@ -307,6 +320,8 @@ struct mmc_host { >> #define MMC_CAP2_HS400_ES (1 << 20) /* Host supports enhanced strobe */ >> #define MMC_CAP2_NO_SD (1 << 21) /* Do not send SD commands during initialization */ >> #define MMC_CAP2_NO_MMC (1 << 22) /* Do not send (e)MMC commands during initialization */ >> +#define MMC_CAP2_CQE (1 << 23) /* Has eMMC command queue engine */ >> +#define MMC_CAP2_CQE_DCMD (1 << 24) /* CQE can issue a direct command */ >> >> mmc_pm_flag_t pm_caps; /* supported pm features */ >> >> @@ -393,6 +408,15 @@ struct mmc_host { >> int dsr_req; /* DSR value is valid */ >> u32 dsr; /* optional driver stage (DSR) value */ >> >> + /* Command Queue Engine (CQE) support */ >> + const struct mmc_cqe_ops *cqe_ops; >> + void *cqe_private; >> + void (*cqe_recovery_notifier)(struct mmc_host *, >> + struct mmc_request *); > > Please add a comment here to understand how this callback is going to be used. OK > >> + int cqe_qdepth; >> + bool cqe_enabled; >> + bool cqe_on; >> + >> unsigned long private[0] ____cacheline_aligned; >> }; >> >> -- >> 1.9.1 >> > > Kind regards > Uffe > -- 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
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index ebd1cebbef0c..4dd7ada9b4b9 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -162,6 +162,19 @@ struct mmc_host_ops { unsigned int direction, int blk_size); }; +struct mmc_cqe_ops { + int (*cqe_enable)(struct mmc_host *host, struct mmc_card *card); + void (*cqe_disable)(struct mmc_host *host); + int (*cqe_request)(struct mmc_host *host, struct mmc_request *mrq); + void (*cqe_post_req)(struct mmc_host *host, struct mmc_request *mrq); + void (*cqe_off)(struct mmc_host *host); + int (*cqe_wait_for_idle)(struct mmc_host *host); + bool (*cqe_timeout)(struct mmc_host *host, struct mmc_request *mrq, + bool *recovery_needed); + void (*cqe_recovery_start)(struct mmc_host *host); + void (*cqe_recovery_finish)(struct mmc_host *host); +}; + struct mmc_async_req { /* active mmc request */ struct mmc_request *mrq; @@ -307,6 +320,8 @@ struct mmc_host { #define MMC_CAP2_HS400_ES (1 << 20) /* Host supports enhanced strobe */ #define MMC_CAP2_NO_SD (1 << 21) /* Do not send SD commands during initialization */ #define MMC_CAP2_NO_MMC (1 << 22) /* Do not send (e)MMC commands during initialization */ +#define MMC_CAP2_CQE (1 << 23) /* Has eMMC command queue engine */ +#define MMC_CAP2_CQE_DCMD (1 << 24) /* CQE can issue a direct command */ mmc_pm_flag_t pm_caps; /* supported pm features */ @@ -393,6 +408,15 @@ struct mmc_host { int dsr_req; /* DSR value is valid */ u32 dsr; /* optional driver stage (DSR) value */ + /* Command Queue Engine (CQE) support */ + const struct mmc_cqe_ops *cqe_ops; + void *cqe_private; + void (*cqe_recovery_notifier)(struct mmc_host *, + struct mmc_request *); + int cqe_qdepth; + bool cqe_enabled; + bool cqe_on; + unsigned long private[0] ____cacheline_aligned; };
Add CQE host operations, capabilities, and host members. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- include/linux/mmc/host.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)