Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp33769pxv; Wed, 30 Jun 2021 14:12:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmRZsGGgZcij2uVNlwD3VSkYRhh432H4QfOq9JEs3Cvapdo1OA2JB7JYIbn1ipE0JUaQ6d X-Received: by 2002:a02:c808:: with SMTP id p8mr10776802jao.109.1625087546552; Wed, 30 Jun 2021 14:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625087546; cv=none; d=google.com; s=arc-20160816; b=UsuViv/4KO/dBD2snUnEXFtCgwefBaHsrdstd4+GNhj4+0pkxC/LyfELr79/lxyaGi 8PkeFwcsSYa4Ee4Ml+lgWkJUlf1RInkoqPjSxhMbVRx9+aabmJQ/WRVXH4j+T5fHwWGs dxhPTqYOODy87/Gb4a2W/8lkDQJc5RNRxSmzhDExLxYWBsG2an2Kc1egyxyVToGma8ob w3u/41DatsJ+E7QXb5mJ4sfS+eYYqjWcMht1C9nrsVG3AEI6aCB0KCbhQBF1lsVSmrE1 vMd3YcKhQ72HsPxkNW7x0xd6n75pjaiZph5zhUNdEk19PWHJJdMLPHBEKqgYhXwdhgHD KsNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=XPNJHbWbsWgDLeds/Otl1XHmlJ48mQQXW8GrDKEtXhk=; b=CAt16c/bJpAJYdtVclQD9mw1ijYMpnyTNCv4wGqgnM3APZWz0j4N6JMPAeoIKEI7pA zvMXIK66qo+BJgK4ebsUPwRQewmXXMmqeV1Rgytk+d0MebcBiXLA7ng7pUsaJLc2RlCc Q4GgAXkW1Z4S/jmPbEM+uRqbZF+oluOdEXGDMnFiTT9bkaMQLf/iMsT9IwKyhZYUdSIY IUXTp6g3KCDbdGjfQAPsGx/bKOELrNvAnDPyHvLGtydRf4g2BWzSUhYlLLwgRmPmCMkT 1SzzPDzDdBZuMb9dPwzHAWqseJEH4Hi6w6sdaC8WTVoUfet2wq+S56Pr2Kk9NhQ3GAWi A4Jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s9si2844856iow.41.2021.06.30.14.12.12; Wed, 30 Jun 2021 14:12:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235237AbhF3VNC (ORCPT + 99 others); Wed, 30 Jun 2021 17:13:02 -0400 Received: from mga18.intel.com ([134.134.136.126]:4263 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235071AbhF3VMo (ORCPT ); Wed, 30 Jun 2021 17:12:44 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10031"; a="195720722" X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="195720722" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2021 14:10:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="558431175" Received: from otc-lr-04.jf.intel.com ([10.54.39.41]) by orsmga004.jf.intel.com with ESMTP; 30 Jun 2021 14:10:14 -0700 From: kan.liang@linux.intel.com To: peterz@infradead.org, mingo@redhat.com, gregkh@linuxfoundation.org, acme@kernel.org, linux-kernel@vger.kernel.org Cc: eranian@google.com, namhyung@kernel.org, jolsa@redhat.com, ak@linux.intel.com, yao.jin@linux.intel.com, Kan Liang Subject: [PATCH V4 04/16] perf/x86/intel/uncore: Add Sapphire Rapids server IRP support Date: Wed, 30 Jun 2021 14:08:28 -0700 Message-Id: <1625087320-194204-5-git-send-email-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1625087320-194204-1-git-send-email-kan.liang@linux.intel.com> References: <1625087320-194204-1-git-send-email-kan.liang@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang The IRP is responsible for maintaining coherency for the IIO traffic targeting coherent memory. The layout of the control registers for a IRP uncore unit is a little bit different from the generic one. Factor out SPR_UNCORE_COMMON_FORMAT, which can be reused by the following uncore units. Reviewed-by: Andi Kleen Signed-off-by: Kan Liang --- arch/x86/events/intel/uncore_snbep.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 3f44518..8cefeeb 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -5445,12 +5445,37 @@ static struct intel_uncore_type spr_uncore_iio = { .format_group = &snr_uncore_iio_format_group, }; +static struct attribute *spr_uncore_raw_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask_ext4.attr, + &format_attr_edge.attr, + &format_attr_inv.attr, + &format_attr_thresh8.attr, + NULL, +}; + +static const struct attribute_group spr_uncore_raw_format_group = { + .name = "format", + .attrs = spr_uncore_raw_formats_attr, +}; + +#define SPR_UNCORE_COMMON_FORMAT() \ + .event_mask = SNBEP_PMON_RAW_EVENT_MASK, \ + .event_mask_ext = SPR_RAW_EVENT_MASK_EXT, \ + .format_group = &spr_uncore_raw_format_group + +static struct intel_uncore_type spr_uncore_irp = { + SPR_UNCORE_COMMON_FORMAT(), + .name = "irp", + +}; + #define UNCORE_SPR_NUM_UNCORE_TYPES 12 static struct intel_uncore_type *spr_uncores[UNCORE_SPR_NUM_UNCORE_TYPES] = { &spr_uncore_chabox, &spr_uncore_iio, - NULL, + &spr_uncore_irp, NULL, NULL, NULL, -- 2.7.4