From nobody Fri Dec 19 12:31:32 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A1BA1640D for ; Wed, 20 Dec 2023 07:31:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RAFGEOXG" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-336755f1688so1143468f8f.0 for ; Tue, 19 Dec 2023 23:31:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703057510; x=1703662310; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Li7fTALBuQ9Y3zgS/Ez2vT3o1PVceUgO0II6eATZKYQ=; b=RAFGEOXGdD7P8015P3lNuQlL5kWVZekqrKmEHK0pvFDDB54RUM72P1HO0rPCieTxG0 9RkCR36e9xLY7sqy4gJ73g7KzlfzkBS5y+4wwBdI9DOSjdQbVlJE+oXUDBlcPxlA6ifE ZA01Lh+KEz5sNt20gvVHOwj/b19dNeuQhcaXzhc++L+aoRxc0wf7KtgRG/W7gDAcHzbm ShBH3+TEtptIZa2pdTlH3aoVVkxJFK3oX7S3IbPB4n3wfZhhFA4q35IyeWvZJ1KnbARZ FDuXB40lwK2GkBpB6rHiwY78LbdoO9nemSZpHewze5udvXUlui6eSCnSad9AbEI9M3jJ rPGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703057510; x=1703662310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Li7fTALBuQ9Y3zgS/Ez2vT3o1PVceUgO0II6eATZKYQ=; b=RoFWOlD423a5Yu23R5U3aTO57qCgUESDHzD83atyykgjS/FFjDJamgIMV4imr8jjmS JCjwstiQnLT8AFcMIq/M/fxBxKoagmO/0WveV36PVBvAN4qS9YdRx0RBdnEhwaeKaT/8 jYizXCG42hpHrIWryXrTra6QoZL2BlMqoFtLlssXkWig9Br82hoaJ+NR68gHA7rDYEB2 LQ9rmp7ltd5QGazL9eqGskNndsAH2RQO+fZJwavfZQ479p4WwQnRMSh76PtUcP297raO usTjxlJ7xq8yQ3OYgCW+FZG//6EMFUNII4VZjKNlUvsCXmZ1b0cjTMLpJ0G3jiqBPlkh rewA== X-Gm-Message-State: AOJu0YwHrD6AOGV1C/u+DUivU4P5b5W+eX0BaIcR5qMcYFyHckrS/JUK h8hpj0cPIY/igH2N1Z6sdA== X-Google-Smtp-Source: AGHT+IE36QPz6XDiLYD/iC/UKtLshIoHjRygoMgFFQmfYkwhJc9MyZyp971jwxL6u/tvaT7LJEyPNg== X-Received: by 2002:adf:e490:0:b0:336:6817:92e3 with SMTP id i16-20020adfe490000000b00336681792e3mr2553999wrm.89.1703057510581; Tue, 19 Dec 2023 23:31:50 -0800 (PST) Received: from alex-pc-ubuntu.lan (31-10-153-16.cgn.dynamic.upc.ch. [31.10.153.16]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b003366a9cb0d1sm6348461wrr.92.2023.12.19.23.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 23:31:50 -0800 (PST) From: Aleksandrs Vinarskis To: lee@kernel.org, linux-kernel@vger.kernel.org Cc: andriy.shevchenko@linux.intel.com, hdegoede@redhat.com Subject: [PATCH v1 1/2] mfd: intel-lpss: Switch to generalized quirk table Date: Wed, 20 Dec 2023 08:31:47 +0100 Message-Id: <20231220073148.19402-2-alex.vinarskis@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231220073148.19402-1-alex.vinarskis@gmail.com> References: <20231220073148.19402-1-alex.vinarskis@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce generic quirk table, and port existing walkaround for select Microsoft devices to it. This is a preparation for QUIRK_CLOCK_DIVIDER_UNITY. Signed-off-by: Aleksandrs Vinarskis --- drivers/mfd/intel-lpss-pci.c | 28 ++++++++++++++++++++-------- drivers/mfd/intel-lpss.c | 2 +- drivers/mfd/intel-lpss.h | 4 +++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index 4621d3950b8f..cf8006e094f7 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -24,12 +24,19 @@ #include "intel-lpss.h" =20 /* Some DSDTs have an unused GEXP ACPI device conflicting with I2C4 resour= ces */ -static const struct pci_device_id ignore_resource_conflicts_ids[] =3D { - /* Microsoft Surface Go (version 1) I2C4 */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x9d64, 0x152d, 0x1182), }, - /* Microsoft Surface Go 2 I2C4 */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x9d64, 0x152d, 0x1237), }, - { } +static const struct intel_lpss_platform_info quirk_ignore_resource_conflic= ts =3D { + .quirks =3D QUIRK_IGNORE_RESOURCE_CONFLICTS, +}; + +static const struct pci_device_id quirk_ids[] =3D { + { /* Microsoft Surface Go (version 1) I2C4 */ + PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x9d64, 0x152d, 0x1182), + .driver_data =3D (kernel_ulong_t)&quirk_ignore_resource_conflicts, + }, { /* Microsoft Surface Go 2 I2C4 */ + PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x9d64, 0x152d, 0x1237), + .driver_data =3D (kernel_ulong_t)&quirk_ignore_resource_conflicts, + }, + {} }; =20 static int intel_lpss_pci_probe(struct pci_dev *pdev, @@ -37,6 +44,8 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev, { const struct intel_lpss_platform_info *data =3D (void *)id->driver_data; struct intel_lpss_platform_info *info; + const struct intel_lpss_platform_info *quirk_lpss_info; + const struct pci_device_id *quirk_pci_info; int ret; =20 ret =3D pcim_enable_device(pdev); @@ -55,8 +64,11 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev, info->mem =3D pci_resource_n(pdev, 0); info->irq =3D pci_irq_vector(pdev, 0); =20 - if (pci_match_id(ignore_resource_conflicts_ids, pdev)) - info->ignore_resource_conflicts =3D true; + quirk_pci_info =3D pci_match_id(quirk_ids, pdev); + if (quirk_pci_info) { + quirk_lpss_info =3D (void *)quirk_pci_info->driver_data; + info->quirks =3D quirk_lpss_info->quirks; + } =20 pdev->d3cold_delay =3D 0; =20 diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index eff423f7dd28..aafa0da5f8db 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -412,7 +412,7 @@ int intel_lpss_probe(struct device *dev, return ret; =20 lpss->cell->swnode =3D info->swnode; - lpss->cell->ignore_resource_conflicts =3D info->ignore_resource_conflicts; + lpss->cell->ignore_resource_conflicts =3D info->quirks & QUIRK_IGNORE_RES= OURCE_CONFLICTS; =20 intel_lpss_init_dev(lpss); =20 diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h index c1d72b117ed5..3e9d96c372a8 100644 --- a/drivers/mfd/intel-lpss.h +++ b/drivers/mfd/intel-lpss.h @@ -13,14 +13,16 @@ =20 #include =20 +#define QUIRK_IGNORE_RESOURCE_CONFLICTS BIT(0) + struct device; struct resource; struct software_node; =20 struct intel_lpss_platform_info { struct resource *mem; - bool ignore_resource_conflicts; int irq; + unsigned int quirks; unsigned long clk_rate; const char *clk_con_id; const struct software_node *swnode; --=20 2.40.1 From nobody Fri Dec 19 12:31:32 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C4A016430 for ; Wed, 20 Dec 2023 07:31:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TQlEbAsY" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-40c31f18274so67958755e9.0 for ; Tue, 19 Dec 2023 23:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703057512; x=1703662312; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KgTfKXWY7XjvekdpFsE0LKPur0TdoR58RWZw0DnkjLQ=; b=TQlEbAsYS8edx3ya61BDjIT86GP3+Z+K2Bz/di8cJvkqRIhCnHfl47O7WNHucJLvF7 /Hklx8SBYNpBBk2U6jS3ynNA/aYLjs2t2rAYnhj7uE/GZE0LbdqJSviVZQMPkeKoD08h 7KlWZxd61M6bLD/EffE41k+9L0XQaD9tfH4jyG5XNXDWe/vl663g5V1TbhOEiy5mpakH 5jNmu5etlL1+pvfy5IaYwMrJzxV6lkxWP5wxaUN5YPSdYxP+mEHHpv8mI+LMW9gmwWNz xlhDYDQLsvHeIuwmGdVfPPPjcxgB0Fr+DrgJd1zV6z/bvwsa3DQP8yi1rZCAdDdSGKEp JSyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703057512; x=1703662312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KgTfKXWY7XjvekdpFsE0LKPur0TdoR58RWZw0DnkjLQ=; b=TJsZZGDYRA9IZL51b+48gOUpq04pKmvFXUFV7/lINLQTlO0cPl2yfy/v8RokucXDPh b6UEIpRK8TPhfboZtGyJI219FicXa49qh8migtfSTLN26cn2BZx6OIeXHlIu4f7G/n0m nzT5EeaGKKP+pCYyisAHgOq5z893veAmSI4r2RzPm+sOKlfAbHMc3ZAMCxXDA5iFmwTS MzI2V+nYpbhFvjrtSxQ5scdbgEH6zAGfAoJocQXlAD2a+C5g9g15TeN+21d1Fym86EQb 8NJjAGdIsTs/AigkuC0STSL5/v8NGHNjwYMXRLPhEvuhvGEUl4athqKeoXeI8xaqgpvp yJwQ== X-Gm-Message-State: AOJu0YwGjgJIfzHoi5TuG9IFaPTKTW/b/IpoFEVbKvSe+6EBgHWdWFF1 GAQwKv7xJ39OILlnK6oosb0fpUcoFkSi X-Google-Smtp-Source: AGHT+IE6OCx7xv9Ck8Ua1xJJjOOvuOQiCQa5MA3KZmAJTZXFR0gauoPXCD0l8/8mRJP+aBGkO1EUgw== X-Received: by 2002:a05:600c:4746:b0:40c:6136:10eb with SMTP id w6-20020a05600c474600b0040c613610ebmr5976247wmo.36.1703057512145; Tue, 19 Dec 2023 23:31:52 -0800 (PST) Received: from alex-pc-ubuntu.lan (31-10-153-16.cgn.dynamic.upc.ch. [31.10.153.16]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b003366a9cb0d1sm6348461wrr.92.2023.12.19.23.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 23:31:50 -0800 (PST) From: Aleksandrs Vinarskis To: lee@kernel.org, linux-kernel@vger.kernel.org Cc: andriy.shevchenko@linux.intel.com, hdegoede@redhat.com Subject: [PATCH v1 2/2] mfd: intel-lpss: Introduce QUIRK_CLOCK_DIVIDER_UNITY for XPS 9530 Date: Wed, 20 Dec 2023 08:31:48 +0100 Message-Id: <20231220073148.19402-3-alex.vinarskis@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231220073148.19402-1-alex.vinarskis@gmail.com> References: <20231220073148.19402-1-alex.vinarskis@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some devices (eg. Dell XPS 9530, 2023) due to a firmware bug have a misconfigured clock divider, which should've been 1:1. This introduces quirk which conditionally re-configures the clock divider to 1:1. Signed-off-by: Aleksandrs Vinarskis --- drivers/mfd/intel-lpss-pci.c | 8 ++++++++ drivers/mfd/intel-lpss.c | 7 +++++++ drivers/mfd/intel-lpss.h | 1 + 3 files changed, 16 insertions(+) diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index cf8006e094f7..2e3b91418415 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -28,6 +28,11 @@ static const struct intel_lpss_platform_info quirk_ignor= e_resource_conflicts =3D { .quirks =3D QUIRK_IGNORE_RESOURCE_CONFLICTS, }; =20 +/* Some devices have misconfigured clock divider, which should've been 1:1= */ +static const struct intel_lpss_platform_info quirk_skip_clock_divider =3D { + .quirks =3D QUIRK_CLOCK_DIVIDER_UNITY, +}; + static const struct pci_device_id quirk_ids[] =3D { { /* Microsoft Surface Go (version 1) I2C4 */ PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x9d64, 0x152d, 0x1182), @@ -35,6 +40,9 @@ static const struct pci_device_id quirk_ids[] =3D { }, { /* Microsoft Surface Go 2 I2C4 */ PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x9d64, 0x152d, 0x1237), .driver_data =3D (kernel_ulong_t)&quirk_ignore_resource_conflicts, + }, { /* Dell XPS 9530 (2023) */ + PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, 0x51fb, 0x1028, 0x0beb), + .driver_data =3D (kernel_ulong_t)&quirk_skip_clock_divider, }, {} }; diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index aafa0da5f8db..2a9018112dfc 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -300,6 +300,7 @@ static int intel_lpss_register_clock_divider(struct int= el_lpss *lpss, { char name[32]; struct clk *tmp =3D *clk; + int ret; =20 snprintf(name, sizeof(name), "%s-enable", devname); tmp =3D clk_register_gate(NULL, name, __clk_get_name(tmp), 0, @@ -316,6 +317,12 @@ static int intel_lpss_register_clock_divider(struct in= tel_lpss *lpss, return PTR_ERR(tmp); *clk =3D tmp; =20 + if (lpss->info->quirks & QUIRK_CLOCK_DIVIDER_UNITY) { + ret =3D clk_set_rate(tmp, lpss->info->clk_rate); + if (ret) + return ret; + } + snprintf(name, sizeof(name), "%s-update", devname); tmp =3D clk_register_gate(NULL, name, __clk_get_name(tmp), CLK_SET_RATE_PARENT, lpss->priv, 31, 0, NULL); diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h index 3e9d96c372a8..f27834b74cb6 100644 --- a/drivers/mfd/intel-lpss.h +++ b/drivers/mfd/intel-lpss.h @@ -14,6 +14,7 @@ #include =20 #define QUIRK_IGNORE_RESOURCE_CONFLICTS BIT(0) +#define QUIRK_CLOCK_DIVIDER_UNITY BIT(1) =20 struct device; struct resource; --=20 2.40.1