From patchwork Fri Apr 20 03:29:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salter X-Patchwork-Id: 133851 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp246261ljf; Thu, 19 Apr 2018 20:30:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+c2pAOera0E1TTxVrg7FTfTlbWuEiuRwhXu3R6Mw0NAQnN+CVm7swUHyGm7dMR0hwwcIXs X-Received: by 10.98.44.78 with SMTP id s75mr5834934pfs.237.1524195009709; Thu, 19 Apr 2018 20:30:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524195009; cv=none; d=google.com; s=arc-20160816; b=k7F7viLdY2E9ZEwu1cE/qpJLHM/m8xMRzuUsEemGae5nOceGolkxNK42Nw5fh8s7Go HljSntIT+biykfK97Exc8GR+EF8dGkvfiIKjOptqHZnD1I5ZQv3bseyAWVAE5QK0a3bs OMO4ye97MssQQBgICCwY3PH12JunEJ5/yUyKR7goJpoIxqlpk1QgQu2Jh9Bhp0tnoGg4 N9yyHhTdfTtPUEV40BEngDIPQo6Iw0vNBgMgF4mG7BsGSYfmWLNcH58UG/R5MojMloxv +6pyV5nZ3PfwEshxKfKp+ygkSMni8Skab19QkYoOPdW/N5vkjNq7u2hp90cF+MRB56hI h1Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=DFhvgkXsiOpjRDmejfG9kSXDhtcf5zavDI4PAgwRr34=; b=sZwOOwmZfht4tr7E9BWB3Wgtvkr/stzWnshIbhZ9wwMi1y+xC3JOwrWyOU+F/pDONy x8WvttM0AMaUK8D+g1t89v73Uiy7ZaYxlG09wtu2A1azmzzplBd/DSTnKF8fjA+0ZC6Y k81YL8ZaJBWCY58CnBzY52JjMZ4J2/znwd9Vn3LVr1gMrNbKMxS7HJ4nHk1GAkeXrDHm 9j7IdmXtCkvVpJpWLI1b7NeksoOEtZamEYD5l9T/ZHendWjmRRMnYUU3GVf6iI9gVEp2 AgK8KIQ3Nip2jQ0geBF7Sioj4zk2De8OVB7yZy/Y7tP6r1+ERzNU09GgJyXEGo70cIrm zt5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z5si4102134pgu.377.2018.04.19.20.30.09; Thu, 19 Apr 2018 20:30:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754108AbeDTDaH (ORCPT + 8 others); Thu, 19 Apr 2018 23:30:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44476 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754077AbeDTDaH (ORCPT ); Thu, 19 Apr 2018 23:30:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0DD34023335; Fri, 20 Apr 2018 03:30:06 +0000 (UTC) Received: from rhp50.localdomain (ovpn-126-45.rdu2.redhat.com [10.10.126.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EAB92166BAE; Fri, 20 Apr 2018 03:30:06 +0000 (UTC) From: Mark Salter To: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= Cc: "Rafael J . Wysocki" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ACPI / scan: Fix regression related to X-Gene UARTs Date: Thu, 19 Apr 2018 23:29:47 -0400 Message-Id: <20180420032947.23023-1-msalter@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 20 Apr 2018 03:30:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 20 Apr 2018 03:30:06 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'msalter@redhat.com' RCPT:'' Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Commit e361d1f85855 ("ACPI / scan: Fix enumeration for special UART devices") caused a regression with some X-Gene based platforms (Mustang and M400) with invalid DSDT. The DSDT makes it appear that the UART device is also a slave device attached to itself. With the above commit the UART won't be enumerated by ACPI scan (slave serial devices shouldn't be). So check for X-Gene UART device and skip slace device check on it. Signed-off-by: Mark Salter --- drivers/acpi/scan.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.14.3 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index cc234e6a6297..1dcdd0122862 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1551,6 +1551,14 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) fwnode_property_present(&device->fwnode, "baud"))) return true; + /* + * Firmware on some arm64 X-Gene platforms will make the UART + * device appear as both a UART and a slave of that UART. Just + * bail out here for X-Gene UARTs. + */ + if (!strcmp(acpi_device_hid(device), "APMC0D08")) + return false; + INIT_LIST_HEAD(&resource_list); acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave,