From patchwork Fri Sep 28 02:57:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffrey Hugo X-Patchwork-Id: 10618901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 16B9815A6 for ; Fri, 28 Sep 2018 02:58:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0751C2B3C9 for ; Fri, 28 Sep 2018 02:58:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF79D2B636; Fri, 28 Sep 2018 02:58:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97F902B3C9 for ; Fri, 28 Sep 2018 02:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728123AbeI1JTp (ORCPT ); Fri, 28 Sep 2018 05:19:45 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:41812 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726091AbeI1JTp (ORCPT ); Fri, 28 Sep 2018 05:19:45 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id A3B3A600C1; Fri, 28 Sep 2018 02:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1538103495; bh=RCOF2X+A95ccqtXgFRdXQpNgpHTChgmew+X/52w81fY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lkhzDkDaIK+UDd9z7YyVb83prFwLnnvye2Xxn7QUWsY3/SQFmr4CoWdZqyDKusY+g a6hLx9E51eBSEy0aYtG0Pz1AtdwN4NPRuVVV6bJ7tj2CGENkLAdO7nfB5ko44tm5DK dH30Dp8WvVljeji9MzLKpevDB/SrNE26gbNXzRdE= Received: from jhugo-perf-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jhugo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4BA6C600C1; Fri, 28 Sep 2018 02:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1538103495; bh=RCOF2X+A95ccqtXgFRdXQpNgpHTChgmew+X/52w81fY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lkhzDkDaIK+UDd9z7YyVb83prFwLnnvye2Xxn7QUWsY3/SQFmr4CoWdZqyDKusY+g a6hLx9E51eBSEy0aYtG0Pz1AtdwN4NPRuVVV6bJ7tj2CGENkLAdO7nfB5ko44tm5DK dH30Dp8WvVljeji9MzLKpevDB/SrNE26gbNXzRdE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4BA6C600C1 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jhugo@codeaurora.org From: Jeffrey Hugo To: sudeep.holla@arm.com, gregkh@linuxfoundation.org, rjw@rjwysocki.net, linux-acpi@vger.kernel.org, jeremy.linton@arm.com Cc: linux-kernel@vger.kernel.org, vkilari@codeaurora.org, Jeffrey Hugo Subject: [PATCH v3 1/2] drivers: base: cacheinfo: Do not populate sysfs for unknown cache types Date: Thu, 27 Sep 2018 20:57:56 -0600 Message-Id: <1538103477-15513-2-git-send-email-jhugo@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1538103477-15513-1-git-send-email-jhugo@codeaurora.org> References: <1538103477-15513-1-git-send-email-jhugo@codeaurora.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a cache has an unknown type because neither the hardware nor the firmware told us, an entry in the sysfs tree will be made, but the type file will not be present. lscpu depends on the type file being present for every entry, and will error out without printing system information if lscpu cannot open the type file. Presenting information about a cache without indicating its type is not useful, therefore if we hit a cache with an unknown type, stop populating sysfs so that userspace has the maximum amount of useful information. This addresses the following lscpu error, which prevents any output. lscpu: cannot open /sys/devices/system/cpu/cpu0/cache/index3/type: No such file or directory Suggested-by: Sudeep Holla Signed-off-by: Jeffrey Hugo Reviewed-by: Jeremy Linton Reviewed-by: Sudeep Holla --- drivers/base/cacheinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 5d5b598..cf78fa6 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -615,6 +615,8 @@ static int cache_add_dev(unsigned int cpu) this_leaf = this_cpu_ci->info_list + i; if (this_leaf->disable_sysfs) continue; + if (this_leaf->type == CACHE_TYPE_NOCACHE) + break; cache_groups = cache_get_attribute_groups(this_leaf); ci_dev = cpu_device_create(parent, this_leaf, cache_groups, "index%1u", i);