From patchwork Wed Jan 22 09:27:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233349 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.7 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCE09C33CB6 for ; Wed, 22 Jan 2020 13:31:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 841EE24125 for ; Wed, 22 Jan 2020 13:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699891; bh=3gY41t3PBbf9Bh54MQwzN0iQ5H5WEPl331nOFmFK0gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jBAxBwq0kKPl+WRqACQJUO4v8dxVhYvN7mrG6ilU5p1j5IGwIOoUUIdAi2VZd/rGb jeo39Oks7bduUI/esNbHS/bzfLcwgDuYy61JomeoGevA84eICxNWqP5u5vfNjgnv4l ddnRQZTMJh9TFBx8yohEE3PLFOP0ANl7+VbbADTI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729793AbgAVNTt (ORCPT ); Wed, 22 Jan 2020 08:19:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:35762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725933AbgAVNTo (ORCPT ); Wed, 22 Jan 2020 08:19:44 -0500 Received: from localhost (unknown [84.241.205.26]) (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 512AE2468A; Wed, 22 Jan 2020 13:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699183; bh=3gY41t3PBbf9Bh54MQwzN0iQ5H5WEPl331nOFmFK0gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1m+b2j1WYkCPfgGXQ4ApUXw60uFVkAwgTIRSvqd4c4Kya2VAX3dnnDxlS2OpbZRx OGM7Ne02G+Uj3r58knncanAuYj9ekVBOr/Xif8StS0O/2c7VTwUFG4zaHe2ucEBY5+ ArEML+NxfdVug2lyvXwQ2lbtnW7RVLcjN6Tlp8nI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Like Xu , Kan Liang , "Peter Zijlstra (Intel)" , Ingo Molnar Subject: [PATCH 5.4 065/222] perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events Date: Wed, 22 Jan 2020 10:27:31 +0100 Message-Id: <20200122092838.375669008@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kan Liang commit fa694ae532836bd2f4cd659e9b4032abaf9fa9e5 upstream. An Oops during the boot is found on some SNR machines. It turns out this is because the snr_uncore_imc_freerunning_events[] array was missing an end-marker. Fixes: ee49532b38dd ("perf/x86/intel/uncore: Add IMC uncore support for Snow Ridge") Reported-by: Like Xu Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Like Xu Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20200116200210.18937-1-kan.liang@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/events/intel/uncore_snbep.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -4536,6 +4536,7 @@ static struct uncore_event_desc snr_unco INTEL_UNCORE_EVENT_DESC(write, "event=0xff,umask=0x21"), INTEL_UNCORE_EVENT_DESC(write.scale, "3.814697266e-6"), INTEL_UNCORE_EVENT_DESC(write.unit, "MiB"), + { /* end: all zeroes */ }, }; static struct intel_uncore_ops snr_uncore_imc_freerunning_ops = {