linux-kernel - Re: [PATCH v2 2/2] cqhci-core: Make use cqhci

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAPDyKFonYhKdJuFN_v=S-MCyRHUJ8015fxuJ7xeG7jQtX-9xCw@mail.gmail.com>
Date: Tue, 3 Sep 2024 14:37:18 +0200
From: Ulf Hansson <ulf.hansson@...aro.org>
To: Seunghwan Baek <sh8267.baek@...sung.com>
Cc: linux-kernel@...r.kernel.org, linux-mmc@...r.kernel.org, 
	ritesh.list@...il.com, quic_asutoshd@...cinc.com, adrian.hunter@...el.com, 
	grant.jung@...sung.com, jt77.jang@...sung.com, junwoo80.lee@...sung.com, 
	dh0421.hwang@...sung.com, jangsub.yi@...sung.com, sh043.lee@...sung.com, 
	cw9316.lee@...sung.com, wkon.kim@...sung.com
Subject: Re: [PATCH v2 2/2] cqhci-core: Make use cqhci_halted() routine

On Thu, 29 Aug 2024 at 08:18, Seunghwan Baek <sh8267.baek@...sung.com> wrote:
>
> Code to check whether cqe is in halt state is modified to cqhci_halted,
> which has already been implemented.
>
> Signed-off-by: Seunghwan Baek <sh8267.baek@...sung.com>

Applied for next (and by amending the commit message according to
suggestions from Adrian), thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/cqhci-core.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
> index a02da26a1efd..178277d90c31 100644
> --- a/drivers/mmc/host/cqhci-core.c
> +++ b/drivers/mmc/host/cqhci-core.c
> @@ -33,6 +33,11 @@ struct cqhci_slot {
>  #define CQHCI_HOST_OTHER       BIT(4)
>  };
>
> +static bool cqhci_halted(struct cqhci_host *cq_host)
> +{
> +       return cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT;
> +}
> +
>  static inline u8 *get_desc(struct cqhci_host *cq_host, u8 tag)
>  {
>         return cq_host->desc_base + (tag * cq_host->slot_sz);
> @@ -282,7 +287,7 @@ static void __cqhci_enable(struct cqhci_host *cq_host)
>
>         cqhci_writel(cq_host, cqcfg, CQHCI_CFG);
>
> -       if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT)
> +       if (cqhci_halted(cq_host))
>                 cqhci_writel(cq_host, 0, CQHCI_CTL);
>
>         mmc->cqe_on = true;
> @@ -617,7 +622,7 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
>                 cqhci_writel(cq_host, 0, CQHCI_CTL);
>                 mmc->cqe_on = true;
>                 pr_debug("%s: cqhci: CQE on\n", mmc_hostname(mmc));
> -               if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT) {
> +               if (cqhci_halted(cq_host)) {
>                         pr_err("%s: cqhci: CQE failed to exit halt state\n",
>                                mmc_hostname(mmc));
>                 }
> @@ -953,11 +958,6 @@ static bool cqhci_clear_all_tasks(struct mmc_host *mmc, unsigned int timeout)
>         return ret;
>  }
>
> -static bool cqhci_halted(struct cqhci_host *cq_host)
> -{
> -       return cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT;
> -}
> -
>  static bool cqhci_halt(struct mmc_host *mmc, unsigned int timeout)
>  {
>         struct cqhci_host *cq_host = mmc->cqe_private;
> --
> 2.17.1
>