On 9/08/22 20:37, Liming Sun wrote:
> Commit 08f3dff799d43 introduces the of_device_get_match_data()
> checking for some chip but breaks the BlueField-3 firmware which
> uses ACPI instead. This commit adds the ACPI match data and
> quirks/quirks2 to re-enable the support of BlueField-3 SoC.
>
> Reviewed-by: David Woods <davwoods@xxxxxxxxxx>
> Signed-off-by: Liming Sun <limings@xxxxxxxxxx>
Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
> v2->v3:
> Rebase to mmc next
> v1->v2:
> Fixes an acpi warning
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> v1: Initial version.
> ---
> drivers/mmc/host/sdhci-of-dwcmshc.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
> index 4e904850973c..a7343d4bc50e 100644
> --- a/drivers/mmc/host/sdhci-of-dwcmshc.c
> +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
> @@ -349,6 +349,15 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = {
> .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
> };
>
> +#ifdef CONFIG_ACPI
> +static const struct sdhci_pltfm_data sdhci_dwcmshc_bf3_pdata = {
> + .ops = &sdhci_dwcmshc_ops,
> + .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
> + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
> + SDHCI_QUIRK2_ACMD23_BROKEN,
> +};
> +#endif
> +
> static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
> .ops = &sdhci_dwcmshc_rk35xx_ops,
> .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
> @@ -431,7 +440,10 @@ MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids);
>
> #ifdef CONFIG_ACPI
> static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = {
> - { .id = "MLNXBF30" },
> + {
> + .id = "MLNXBF30",
> + .driver_data = (kernel_ulong_t)&sdhci_dwcmshc_bf3_pdata,
> + },
> {}
> };
> #endif
> @@ -447,7 +459,7 @@ static int dwcmshc_probe(struct platform_device *pdev)
> int err;
> u32 extra;
>
> - pltfm_data = of_device_get_match_data(&pdev->dev);
> + pltfm_data = device_get_match_data(&pdev->dev);
> if (!pltfm_data) {
> dev_err(&pdev->dev, "Error: No device match data found\n");
> return -ENODEV;
