Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4975545imu; Tue, 15 Jan 2019 09:03:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN5+CdPSLjTO4Fft4Rfj+hh2s5oKnNq2Q4ccSidSmA/RQlmZGIEnnud8DueSkTCn25CwX9JF X-Received: by 2002:a63:193:: with SMTP id 141mr4702711pgb.136.1547571798907; Tue, 15 Jan 2019 09:03:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547571798; cv=none; d=google.com; s=arc-20160816; b=IfiicIUtBVO2ZGKc048M8gr8Qcr++Idyp0yK+/RnTdneJNO0E214Qlz9lsEYEnHNqM PHFRi9QyGYbYIat8IZeLbBoQoZb4GfK1G1RZrhAyt3dc5eynvjVn9e8H25U6wejHje4d dk//I3O/hLtQ9kH16C/M98T8D0AyQAAkxo2T5jMoXzFsWeMKVUK2NnoMPD2tMjAZ5guk MOOa90V12jnHgrkdGwUjcHoo+yMXhLbluHgBoT/0QJkH/8CECdmhu6zmGaSsJdx8VBGv zm8+OSgoTyKsPPJHyYBj+WAtusyBgAqEKj7nLGoj25ckznOZVN0/jRpqrim8Gv2q5j+9 oYQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2ROJMcTVAOOpfhIwUKyd9aqGpQq0z++IEMYDcE2COGw=; b=XpCOhFe36jNJKaeQXNwihKMvnSm6kxnP1mwbnVrzINWItoZ3PnDkkK4e7XkVfEtWt1 Cms7DWtBqZ2sOjuRiX0Hgxcg13SNfxfTtshjwTwQrm0ujQPzdakWL5eHyTx/GM/P1YcU IvVgwskU6uPkyho2Jp/AxOpa2rm+hbB8+mAXZe3gmZTfwI8eE8RpilkyXCkrilSmnjqE yNmpMU6zmxPcuz6gKVpZpRTCo3Hi12G32hhogk+J/a9qptJ/Lw5O7dNHc4Dr6dt3oHVP bjKiIWXS9ahhIRVetlrGDE3bXP2jrJjM0apdFVoZROW7YtrTXkKYUWEc1/8hD9vXP0GM nN0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xZJVbGjQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g11si3740177pgu.347.2019.01.15.09.03.01; Tue, 15 Jan 2019 09:03:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xZJVbGjQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732597AbfAOQk0 (ORCPT + 99 others); Tue, 15 Jan 2019 11:40:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:56660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732571AbfAOQkU (ORCPT ); Tue, 15 Jan 2019 11:40:20 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C1C620675; Tue, 15 Jan 2019 16:40:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547570418; bh=MOuei2QNJtixya/i5q4P1Tm5kfZzulRefZ3NZ88e3lE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xZJVbGjQXx1+ZM+MeqKXujhkeItwvuGe0yV5sBlYWzjDdaF0dhDlM5eJAuxhdVyRt X5ljqtoTEDzVKdKdDqPlzNunrFoaLkMA9Fs2wcld1806srOw9sr/4TfE96F7h9000Z b3kyi0hgcWLBriO94rL9A7d8D7IvVwxMPUrcEeTA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , "Rafael J. Wysocki" Subject: [PATCH 4.14 16/27] ACPI: power: Skip duplicate power resource references in _PRx Date: Tue, 15 Jan 2019 17:36:05 +0100 Message-Id: <20190115154902.189329248@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115154901.189747728@linuxfoundation.org> References: <20190115154901.189747728@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede commit 7d7b467cb95bf29597b417d4990160d4ea6d69b9 upstream. Some ACPI tables contain duplicate power resource references like this: Name (_PR0, Package (0x04) // _PR0: Power Resources for D0 { P28P, P18P, P18P, CLK4 }) This causes a WARN_ON in sysfs_add_link_to_group() because we end up adding a link to the same acpi_device twice: sysfs: cannot create duplicate filename '/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/808622C1:00/OVTI2680:00/power_resources_D0/LNXPOWER:0a' CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.19.12-301.fc29.x86_64 #1 Hardware name: Insyde CherryTrail/Type2 - Board Product Name, BIOS jumperx.T87.KFBNEEA02 04/13/2016 Call Trace: dump_stack+0x5c/0x80 sysfs_warn_dup.cold.3+0x17/0x2a sysfs_do_create_link_sd.isra.2+0xa9/0xb0 sysfs_add_link_to_group+0x30/0x50 acpi_power_expose_list+0x74/0xa0 acpi_power_add_remove_device+0x50/0xa0 acpi_add_single_object+0x26b/0x5f0 acpi_bus_check_add+0xc4/0x250 ... To address this issue, make acpi_extract_power_resources() check for duplicates and simply skip them when found. Cc: All applicable Signed-off-by: Hans de Goede [ rjw: Subject & changelog, comments ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/power.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -131,6 +131,23 @@ void acpi_power_resources_list_free(stru } } +static bool acpi_power_resource_is_dup(union acpi_object *package, + unsigned int start, unsigned int i) +{ + acpi_handle rhandle, dup; + unsigned int j; + + /* The caller is expected to check the package element types */ + rhandle = package->package.elements[i].reference.handle; + for (j = start; j < i; j++) { + dup = package->package.elements[j].reference.handle; + if (dup == rhandle) + return true; + } + + return false; +} + int acpi_extract_power_resources(union acpi_object *package, unsigned int start, struct list_head *list) { @@ -150,6 +167,11 @@ int acpi_extract_power_resources(union a err = -ENODEV; break; } + + /* Some ACPI tables contain duplicate power resource references */ + if (acpi_power_resource_is_dup(package, start, i)) + continue; + err = acpi_add_power_resource(rhandle); if (err) break;