From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16D3615FD13 for ; Fri, 15 Nov 2024 07:37:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731656242; cv=none; b=sw+u00y5gVt7P8j8Pv2rG/x0qYjZVX7fu62/ZOslnUJB4kPjcuie7IIewbelGTplaFsq9hRiOfoRjcqtc7qBPynGZEnl2/ekuWJ7ghr3nQMYve5fblv2DdINap8a0JpdFQSBzu2B8G0G9AzC+1qzOCG5BisuGuEJrRjxCcqSF78= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731656242; c=relaxed/simple; bh=D7l4BfuToC2QJErMNxd4NPN7aki0+k8TBW0eqW4q1hg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ZPqZjONTj1CBfZE+DF0v3iCwuEzZSxhmXTI4ZPVJIidIzNeyaUCOVTWOdJEcHEW9EthbrGRm0d15Tdjwqc94vr8bnYrjPJYBLHkoqJIQdRjw02Jnu+66P2atfNP2HTcjwJtVW2iEwD6IkqOWjPxHX/BaNcjUMPujmcgMovOYu4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fLeBW52P; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fLeBW52P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731656240; x=1763192240; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=D7l4BfuToC2QJErMNxd4NPN7aki0+k8TBW0eqW4q1hg=; b=fLeBW52PAk5l/75f1vKjmlZqF3Vf7NHHpbkRC1ddvw2d9VNayxBOrnYy VGFjTjTgjMuinicz09BxMBmMwZmMJ81FHOGwc/H1hOY6x+qnfwoMh37t3 AZmYxl+jlssXO2WMa9d2iPXbVhdXiEi05L4hEsIrhFlrn7rkIWbzehjPZ TZV/oARpwcDe4wC4w/Byb6BHI8IP9JK9AnUFdV6WBk0fA5psGG5ZefAxi sMWeZhkB1sf+UVFusVaKkyrvX1sU2Ps85Jq9rrJhrLM/qqUIxuOOPtNS4 QKV7htV7xvqIPkCgvNsdIV18c2gHCEKOJt/Er4gdCv+rnhMI7ms8iAL+b w==; X-CSE-ConnectionGUID: 7ZxeH6fbRrSYJ4fZoUKBUQ== X-CSE-MsgGUID: +LdPde17Rie2yEUs7E9emQ== X-IronPort-AV: E=McAfee;i="6700,10204,11256"; a="31067091" X-IronPort-AV: E=Sophos;i="6.12,156,1728975600"; d="scan'208";a="31067091" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2024 23:33:51 -0800 X-CSE-ConnectionGUID: GFlIj2m2Rxi1OHQdnmp6Qw== X-CSE-MsgGUID: FX0BGHdMSUWbCbJ9AuRmMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,156,1728975600"; d="scan'208";a="88888825" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.246.16.81]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2024 23:33:49 -0800 Message-ID: <2008ebd5-b1d1-417e-bd88-9d4c0a381e7d@intel.com> Date: Fri, 15 Nov 2024 09:33:44 +0200 Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] mmc: sdhci-pci: Add DMI quirk for missing CD GPIO on Vexia Edu Atla 10 tablet To: Hans de Goede , Ulf Hansson Cc: linux-mmc@vger.kernel.org References: <20241114155611.59577-1-hdegoede@redhat.com> Content-Language: en-US From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: <20241114155611.59577-1-hdegoede@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 14/11/24 17:56, Hans de Goede wrote: > The Vexia Edu Atla 10 tablet distributed to schools in the Spanish > Andalucía region has no ACPI fwnode associated with the SDHCI controller > for its microsd-slot and thus has no ACPI GPIO resource info. > > This causes the following error to be logged and the slot to not work: > [ 10.572113] sdhci-pci 0000:00:12.0: failed to setup card detect gpio > > Add a DMI quirk table for providing gpiod_lookup_tables with manually > provided CD GPIO info and use this DMI table to provide the CD GPIO info > on this tablet. This fixes the microsd-slot not working. > > Signed-off-by: Hans de Goede > --- > Changes in v3: > - Add a cd_gpio_override pointer to sdhci_pci_fixes > - Add sdhci_pci_add_gpio_lookup_table() helper which kmemdup-s a const > struct gpiod_lookup_table to avoid races when using async probing > > Changes in v2: > - Make sdhci_pci_dmi_cd_gpio_overrides static const instead of just const > - Drop duplicate #include (already there at the end) > --- > drivers/mmc/host/sdhci-pci-core.c | 67 +++++++++++++++++++++++++++++++ > drivers/mmc/host/sdhci-pci.h | 1 + > 2 files changed, 68 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index ed45ed0bdafd..a2ddbe3d8742 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1235,6 +1236,29 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = { > .priv_size = sizeof(struct intel_host), > }; > > +/* DMI quirks for devices with missing or broken CD GPIO info */ > +static const struct gpiod_lookup_table vexia_edu_atla10_cd_gpios = { > + .dev_id = "0000:00:12.0", > + .table = { > + GPIO_LOOKUP("INT33FC:00", 38, "cd", GPIO_ACTIVE_HIGH), > + { } > + }, > +}; This is good but I feel like we should make it more difficult to get the size wrong. Could introduce another struct to hold the size: struct sdhci_pci_gpio_data { const struct gpiod_lookup_table *gpios; size_t size; }; static const struct sdhci_pci_gpio_data vexia_edu_atla10_cd_gpio_data = { .gpios = &vexia_edu_atla10_cd_gpios, .size = sizeof(vexia_edu_atla10_cd_gpios), }; So: .driver_data = (void *)&vexia_edu_atla10_cd_gpio_data, and struct sdhci_pci_gpio_data *data; ... data = dmi_id->driver_data; cd_gpio_lookup_table = kmemdup(data->gpios, data->size, GFP_KERNEL); > + > +static const struct dmi_system_id sdhci_intel_byt_cd_gpio_override[] = { > + { > + /* Vexia Edu Atla 10 tablet 9V version */ > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"), > + DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"), > + /* Above strings are too generic, also match on BIOS date */ > + DMI_MATCH(DMI_BIOS_DATE, "08/25/2014"), > + }, > + .driver_data = (void *)&vexia_edu_atla10_cd_gpios, > + }, > + { } > +}; > + > static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { > #ifdef CONFIG_PM_SLEEP > .resume = byt_resume, > @@ -1253,6 +1277,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { > .add_host = byt_add_host, > .remove_slot = byt_remove_slot, > .ops = &sdhci_intel_byt_ops, > + .cd_gpio_override = sdhci_intel_byt_cd_gpio_override, > .priv_size = sizeof(struct intel_host), > }; > > @@ -2054,6 +2079,37 @@ static const struct dev_pm_ops sdhci_pci_pm_ops = { > * * > \*****************************************************************************/ > > +static struct gpiod_lookup_table *sdhci_pci_add_gpio_lookup_table( > + struct sdhci_pci_chip *chip) Let's not line wrap until 100 columns > +{ > + struct gpiod_lookup_table *cd_gpio_lookup_table; > + const struct dmi_system_id *dmi_id = NULL; > + > + if (chip->fixes && chip->fixes->cd_gpio_override) > + dmi_id = dmi_first_match(chip->fixes->cd_gpio_override); > + > + if (!dmi_id) > + return NULL; > + > + cd_gpio_lookup_table = kmemdup(dmi_id->driver_data, > + /* 1 GPIO lookup entry + 1 terminating entry */ > + struct_size(cd_gpio_lookup_table, table, 2), > + GFP_KERNEL); > + if (!cd_gpio_lookup_table) > + return ERR_PTR(-ENOMEM); > + > + gpiod_add_lookup_table(cd_gpio_lookup_table); > + return cd_gpio_lookup_table; > +} > + > +static void sdhci_pci_remove_gpio_lookup_table(struct gpiod_lookup_table *lookup_table) > +{ > + if (lookup_table) { > + gpiod_remove_lookup_table(lookup_table); > + kfree(lookup_table); > + } > +} > + > static struct sdhci_pci_slot *sdhci_pci_probe_slot( > struct pci_dev *pdev, struct sdhci_pci_chip *chip, int first_bar, > int slotno) > @@ -2129,8 +2185,19 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( > device_init_wakeup(&pdev->dev, true); > > if (slot->cd_idx >= 0) { > + struct gpiod_lookup_table *cd_gpio_lookup_table; > + > + cd_gpio_lookup_table = sdhci_pci_add_gpio_lookup_table(chip); > + if (IS_ERR(cd_gpio_lookup_table)) { > + ret = PTR_ERR(cd_gpio_lookup_table); > + goto remove; > + } > + > ret = mmc_gpiod_request_cd(host->mmc, "cd", slot->cd_idx, > slot->cd_override_level, 0); > + > + sdhci_pci_remove_gpio_lookup_table(cd_gpio_lookup_table); > + > if (ret && ret != -EPROBE_DEFER) > ret = mmc_gpiod_request_cd(host->mmc, NULL, > slot->cd_idx, > diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h > index 153704f812ed..4973fa859217 100644 > --- a/drivers/mmc/host/sdhci-pci.h > +++ b/drivers/mmc/host/sdhci-pci.h > @@ -156,6 +156,7 @@ struct sdhci_pci_fixes { > #endif > > const struct sdhci_ops *ops; > + const struct dmi_system_id *cd_gpio_override; > size_t priv_size; > }; >