From 1b1b672cc1d4fb3065dac79efb8901bd6244ef69 Mon Sep 17 00:00:00 2001

From: Utkarsh Patel <utkarsh.h.patel@intel.com>

Date: Tue, 16 Aug 2022 13:16:24 +0300

Subject: [PATCH] usb: typec: intel_pmc_mux: Add new ACPI ID for Meteor Lake IOM device

Git-commit: 1b1b672cc1d4fb3065dac79efb8901bd6244ef69

Patch-mainline: v6.0-rc4

References: jsc#PED-1211

This adds the necessary ACPI ID for Intel Meteor Lake

IOM devices.

The callback function is_memory() is modified so that it

also checks if the resource descriptor passed to it is a

memory type "Address Space Resource Descriptor".

On Intel Meteor Lake the ACPI memory resource is not

described using the "32-bit Memory Range Descriptor" because

the memory is outside of the 32-bit address space. The

memory resource is described using the "Address Space

Resource Descriptor" instead.

Intel Meteor Lake is the first platform to describe the

memory resource for this device with Address Space Resource

Descriptor, but it most likely will not be the last.

Therefore the change to the is_memory() callback function

is made generic.

Signed-off-by: Utkarsh Patel <utkarsh.h.patel@intel.com>

Cc: stable@vger.kernel.org

[ heikki: Rewrote the commit message. ]

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Link: https://lore.kernel.org/r/20220816101629.69054-2-heikki.krogerus@linux.intel.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/usb/typec/mux/intel_pmc_mux.c | 9 +++++++--

 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c

index 47b733f78fb0..a8e273fe204a 100644

--- a/drivers/usb/typec/mux/intel_pmc_mux.c

+++ b/drivers/usb/typec/mux/intel_pmc_mux.c

@@ -571,9 +571,11 @@ static int pmc_usb_register_port(struct pmc_usb *pmc, int index,

 static int is_memory(struct acpi_resource *res, void *data)

 {

-	struct resource r;

+	struct resource_win win = {};

+	struct resource *r = &win.res;

-	return !acpi_dev_resource_memory(res, &r);

+	return !(acpi_dev_resource_memory(res, r) ||

+		 acpi_dev_resource_address_space(res, &win));

 }

 /* IOM ACPI IDs and IOM_PORT_STATUS_OFFSET */

@@ -583,6 +585,9 @@ static const struct acpi_device_id iom_acpi_ids[] = {

 	/* AlderLake */

 	{ "INTC1079", 0x160, },

+

+	/* Meteor Lake */

+	{ "INTC107A", 0x160, },

 	{}

 };

-- 

2.35.3