Skip to content

Commit

Permalink
usb: typec: intel_pmc_mux: Add new ACPI ID for Meteor Lake IOM device
Browse files Browse the repository at this point in the history
commit 1b1b672 upstream.

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>
  • Loading branch information
uhpatel authored and gregkh committed Sep 8, 2022
1 parent b201f62 commit 4be500c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/usb/typec/mux/intel_pmc_mux.c
Expand Up @@ -554,9 +554,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 */
Expand All @@ -566,6 +568,9 @@ static const struct acpi_device_id iom_acpi_ids[] = {

/* AlderLake */
{ "INTC1079", 0x160, },

/* Meteor Lake */
{ "INTC107A", 0x160, },
{}
};

Expand Down

0 comments on commit 4be500c

Please sign in to comment.