Unverified Commit 72b481ee authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5022 [devel-6.6] perf/x86/zhaoxin/uncore: Add KX-7000 support 

Merge Pull Request from: @leoliu-oc 
 
Add support for kx-7000 processors in the zhaoxin pmu uncore, and optimize the code implementation.

### Issue
https://gitee.com/openeuler/kernel/issues/I96M93

### Default Config Change
N/A

### Test
The functional test results on the KX7000 platform are correct.
 
 
Link:https://gitee.com/openeuler/kernel/pulls/5022

 

Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents d9733d59 dc5b9737

arch/x86/events/zhaoxin/uncore.c

+1091 −430

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/events/zhaoxin/uncore.h

+28 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* SPDX-License-Identifier: GPL-2.0+ */

#include <linux/slab.h>

#include <linux/pci.h>

#include <asm/apicdef.h>
@@ -7,9 +7,12 @@ 
#include <linux/perf_event.h>

#include "../perf_event.h"



#define ZHAOXIN_FAM7_WUDAOKOU		0x1b

#define ZHAOXIN_FAM7_LUJIAZUI		0x3b

#define ZHAOXIN_FAM7_YONGFENG		0x5b

#define ZHAOXIN_FAM7_KX5000		0x1b

#define ZHAOXIN_FAM7_KX6000		0x3b

#define ZHAOXIN_FAM7_KH40000	0x5b

#define ZHAOXIN_FAM7_KX8000		0x6b







#define UNCORE_PMU_NAME_LEN		32

#define UNCORE_PMU_HRTIMER_INTERVAL	(60LL * NSEC_PER_SEC)
@@ -43,7 +46,10 @@ struct zhaoxin_uncore_type { 
	unsigned int fixed_ctr;

	unsigned int fixed_ctl;

	unsigned int box_ctl;

	union {

		unsigned int msr_offset;

		unsigned int mmio_offset;

	};

	unsigned int num_shared_regs:8;

	unsigned int single_fixed:1;

	unsigned int pair_ctr_ctl:1;
@@ -154,6 +160,13 @@ static inline bool uncore_pmc_fixed(int idx) 
	return idx == UNCORE_PMC_IDX_FIXED;

}



static inline

unsigned int uncore_mmio_box_ctl(struct zhaoxin_uncore_box *box)

{

	return box->pmu->type->box_ctl +

	       box->pmu->type->mmio_offset * box->pmu->pmu_idx;

}



static inline unsigned int uncore_pci_box_ctl(struct zhaoxin_uncore_box *box)

{

	return box->pmu->type->box_ctl;
@@ -178,6 +191,9 @@ unsigned int uncore_pci_event_ctl(struct zhaoxin_uncore_box *box, int idx) 
static inline

unsigned int uncore_pci_perf_ctr(struct zhaoxin_uncore_box *box, int idx)

{

	if (!strncmp(box->pmu->type->name, "mc_", 3))

		return idx * 2 + box->pmu->type->perf_ctr;

	else

		return idx * 8 + box->pmu->type->perf_ctr;

}
@@ -245,7 +261,7 @@ unsigned int uncore_fixed_ctr(struct zhaoxin_uncore_box *box) 


static inline

unsigned int uncore_event_ctl(struct zhaoxin_uncore_box *box, int idx)

{	if (box->pci_dev)

{	if (box->pci_dev || box->io_addr)

		return uncore_pci_event_ctl(box, idx);

	else

		return uncore_msr_event_ctl(box, idx);
@@ -253,7 +269,7 @@ unsigned int uncore_event_ctl(struct zhaoxin_uncore_box *box, int idx) 


static inline

unsigned int uncore_perf_ctr(struct zhaoxin_uncore_box *box, int idx)

{	if (box->pci_dev)

{	if (box->pci_dev || box->io_addr)

		return uncore_pci_perf_ctr(box, idx);

	else

		return uncore_msr_perf_ctr(box, idx);
@@ -335,9 +351,12 @@ static inline struct zhaoxin_uncore_box *uncore_event_to_box(struct perf_event * 
	return event->pmu_private;

}





static struct zhaoxin_uncore_box *uncore_pmu_to_box(struct zhaoxin_uncore_pmu *pmu, int cpu);

static u64 uncore_msr_read_counter(struct zhaoxin_uncore_box *box, struct perf_event *event);



static void uncore_mmio_exit_box(struct zhaoxin_uncore_box *box);

static u64 uncore_mmio_read_counter(struct zhaoxin_uncore_box *box,

			     struct perf_event *event);

static void uncore_pmu_start_hrtimer(struct zhaoxin_uncore_box *box);

static void uncore_pmu_cancel_hrtimer(struct zhaoxin_uncore_box *box);

static void uncore_pmu_event_start(struct perf_event *event, int flags);
@@ -350,7 +369,3 @@ struct event_constraint * 
uncore_get_constraint(struct zhaoxin_uncore_box *box, struct perf_event *event);

void uncore_put_constraint(struct zhaoxin_uncore_box *box, struct perf_event *event);

u64 uncore_shared_reg_config(struct zhaoxin_uncore_box *box, int idx);
 


void wudaokou_uncore_cpu_init(void);

void yongfeng_uncore_cpu_init(void);

int yongfeng_uncore_pci_init(void);