linux-kernel - Re: [PATCH] misc: rtsx: Fix an error access Page fault

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPDyKFoCHtN9jK3A9YkoQC+e_3XNKJNp7-w1WkNMFBp6n-PH=g@mail.gmail.com>
Date:   Thu, 14 Sep 2023 16:47:33 +0200
From:   Ulf Hansson <ulf.hansson@...aro.org>
To:     Ricky WU <ricky_wu@...ltek.com>
Cc:     "arnd@...db.de" <arnd@...db.de>,
        "gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>,
        "kai.heng.feng@...onical.com" <kai.heng.feng@...onical.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>
Subject: Re: [PATCH] misc: rtsx: Fix an error access Page fault

On Wed, 6 Sept 2023 at 10:03, Ricky WU <ricky_wu@...ltek.com> wrote:
>
> an error occurs on insert SD7.0 card.
> The pci slot of rtsx_pci will Link Down when the SD7.0 card inserted,
> but the rtsx_pci not exit from runtime_idle at that time,
> then do the power_saving function to access the wrong resource
>
> Fixes: 597568e8df04 ("misc: rtsx: Rework runtime power management flow")
> Cc: Kai-Heng Feng <kai.heng.feng@...onical.com>
> Signed-off-by: Ricky Wu <ricky_wu@...ltek.com>

Applied for fixes, thanks!

Greg/Arnd, please let me know if you prefer to funnel this via your
trees instead.

Kind regards
Uffe


> ---
>  drivers/misc/cardreader/rtsx_pcr.c | 14 ++++++++------
>  drivers/mmc/host/rtsx_pci_sdmmc.c  |  1 +
>  include/linux/rtsx_pci.h           |  1 +
>  3 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
> index a3f4b52bb159..536a3681fd5e 100644
> --- a/drivers/misc/cardreader/rtsx_pcr.c
> +++ b/drivers/misc/cardreader/rtsx_pcr.c
> @@ -1526,6 +1526,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
>         pcr->host_sg_tbl_addr = pcr->rtsx_resv_buf_addr + HOST_CMDS_BUF_LEN;
>         pcr->card_inserted = 0;
>         pcr->card_removed = 0;
> +       pcr->is_sd_express = false;
>         INIT_DELAYED_WORK(&pcr->carddet_work, rtsx_pci_card_detect);
>
>         pcr->msi_en = msi_en;
> @@ -1735,12 +1736,13 @@ static int rtsx_pci_runtime_idle(struct device *device)
>
>         pcr->state = PDEV_STAT_IDLE;
>
> -       if (pcr->ops->disable_auto_blink)
> -               pcr->ops->disable_auto_blink(pcr);
> -       if (pcr->ops->turn_off_led)
> -               pcr->ops->turn_off_led(pcr);
> -
> -       rtsx_pm_power_saving(pcr);
> +       if (!pcr->is_sd_express) {
> +               if (pcr->ops->disable_auto_blink)
> +                       pcr->ops->disable_auto_blink(pcr);
> +               if (pcr->ops->turn_off_led)
> +                       pcr->ops->turn_off_led(pcr);
> +               rtsx_pm_power_saving(pcr);
> +       }
>
>         mutex_unlock(&pcr->pcr_mutex);
>
> diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
> index 87d78432a1e0..80b2f2a31fdc 100644
> --- a/drivers/mmc/host/rtsx_pci_sdmmc.c
> +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
> @@ -1393,6 +1393,7 @@ static int sdmmc_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios)
>                 RTS5261_MCU_BUS_SEL_MASK | RTS5261_MCU_CLOCK_SEL_MASK
>                 | RTS5261_DRIVER_ENABLE_FW,
>                 RTS5261_MCU_CLOCK_SEL_16M | RTS5261_DRIVER_ENABLE_FW);
> +       pcr->is_sd_express = true;
>         host->eject = true;
>         return 0;
>  }
> diff --git a/include/linux/rtsx_pci.h b/include/linux/rtsx_pci.h
> index 534038d962e4..295e92224fd0 100644
> --- a/include/linux/rtsx_pci.h
> +++ b/include/linux/rtsx_pci.h
> @@ -1262,6 +1262,7 @@ struct rtsx_pcr {
>         u8                      ocp_stat;
>         u8                      ocp_stat2;
>         u8                      rtd3_en;
> +       bool                    is_sd_express;
>  };
>
>  #define PID_524A       0x524A
> --
> 2.25.1
>