mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
6cfae0c26b
Here is the big char/misc driver pull request for 5.4-rc1. As has been happening in previous releases, more and more individual driver subsystem trees are ending up in here. Now if that is good or bad I can't tell, but hopefully it makes your life easier as it's more of an aggregation of trees together to one merge point for you. Anyway, lots of stuff in here: - habanalabs driver updates - thunderbolt driver updates - misc driver updates - coresight and intel_th hwtracing driver updates - fpga driver updates - extcon driver updates - some dma driver updates - char driver updates - android binder driver updates - nvmem driver updates - phy driver updates - parport driver fixes - pcmcia driver fix - uio driver updates - w1 driver updates - configfs fixes - other assorted driver updates All of these have been in linux-next for a long time with no reported issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCXYIT1g8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ym9lwCgrHZlMMvfYNVm6GQ5ge58JJsVTL4AoNatTcL4 hfVMA6pCHWBjV65xVSf6 =Tijw -----END PGP SIGNATURE----- Merge tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver pull request for 5.4-rc1. As has been happening in previous releases, more and more individual driver subsystem trees are ending up in here. Now if that is good or bad I can't tell, but hopefully it makes your life easier as it's more of an aggregation of trees together to one merge point for you. Anyway, lots of stuff in here: - habanalabs driver updates - thunderbolt driver updates - misc driver updates - coresight and intel_th hwtracing driver updates - fpga driver updates - extcon driver updates - some dma driver updates - char driver updates - android binder driver updates - nvmem driver updates - phy driver updates - parport driver fixes - pcmcia driver fix - uio driver updates - w1 driver updates - configfs fixes - other assorted driver updates All of these have been in linux-next for a long time with no reported issues" * tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (200 commits) misc: mic: Use PTR_ERR_OR_ZERO rather than its implementation habanalabs: correctly cast variable to __le32 habanalabs: show correct id in error print habanalabs: stop using the acronym KMD habanalabs: display card name as sensors header habanalabs: add uapi to retrieve aggregate H/W events habanalabs: add uapi to retrieve device utilization habanalabs: Make the Coresight timestamp perpetual habanalabs: explicitly set the queue-id enumerated numbers habanalabs: print to kernel log when reset is finished habanalabs: replace __le32_to_cpu with le32_to_cpu habanalabs: replace __cpu_to_le32/64 with cpu_to_le32/64 habanalabs: Handle HW_IP_INFO if device disabled or in reset habanalabs: Expose devices after initialization is done habanalabs: improve security in Debug IOCTL habanalabs: use default structure for user input in Debug IOCTL habanalabs: Add descriptive name to PSOC app status register habanalabs: Add descriptive names to PSOC scratch-pad registers habanalabs: create two char devices per ASIC habanalabs: change device_setup_cdev() to be more generic ...
205 lines
5.5 KiB
C
205 lines
5.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _CORESIGHT_PRIV_H
|
|
#define _CORESIGHT_PRIV_H
|
|
|
|
#include <linux/amba/bus.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/io.h>
|
|
#include <linux/coresight.h>
|
|
#include <linux/pm_runtime.h>
|
|
|
|
/*
|
|
* Coresight management registers (0xf00-0xfcc)
|
|
* 0xfa0 - 0xfa4: Management registers in PFTv1.0
|
|
* Trace registers in PFTv1.1
|
|
*/
|
|
#define CORESIGHT_ITCTRL 0xf00
|
|
#define CORESIGHT_CLAIMSET 0xfa0
|
|
#define CORESIGHT_CLAIMCLR 0xfa4
|
|
#define CORESIGHT_LAR 0xfb0
|
|
#define CORESIGHT_LSR 0xfb4
|
|
#define CORESIGHT_AUTHSTATUS 0xfb8
|
|
#define CORESIGHT_DEVID 0xfc8
|
|
#define CORESIGHT_DEVTYPE 0xfcc
|
|
|
|
|
|
/*
|
|
* Coresight device CLAIM protocol.
|
|
* See PSCI - ARM DEN 0022D, Section: 6.8.1 Debug and Trace save and restore.
|
|
*/
|
|
#define CORESIGHT_CLAIM_SELF_HOSTED BIT(1)
|
|
|
|
#define TIMEOUT_US 100
|
|
#define BMVAL(val, lsb, msb) ((val & GENMASK(msb, lsb)) >> lsb)
|
|
|
|
#define ETM_MODE_EXCL_KERN BIT(30)
|
|
#define ETM_MODE_EXCL_USER BIT(31)
|
|
|
|
typedef u32 (*coresight_read_fn)(const struct device *, u32 offset);
|
|
#define __coresight_simple_func(type, func, name, lo_off, hi_off) \
|
|
static ssize_t name##_show(struct device *_dev, \
|
|
struct device_attribute *attr, char *buf) \
|
|
{ \
|
|
type *drvdata = dev_get_drvdata(_dev->parent); \
|
|
coresight_read_fn fn = func; \
|
|
u64 val; \
|
|
pm_runtime_get_sync(_dev->parent); \
|
|
if (fn) \
|
|
val = (u64)fn(_dev->parent, lo_off); \
|
|
else \
|
|
val = coresight_read_reg_pair(drvdata->base, \
|
|
lo_off, hi_off); \
|
|
pm_runtime_put_sync(_dev->parent); \
|
|
return scnprintf(buf, PAGE_SIZE, "0x%llx\n", val); \
|
|
} \
|
|
static DEVICE_ATTR_RO(name)
|
|
|
|
#define coresight_simple_func(type, func, name, offset) \
|
|
__coresight_simple_func(type, func, name, offset, -1)
|
|
#define coresight_simple_reg32(type, name, offset) \
|
|
__coresight_simple_func(type, NULL, name, offset, -1)
|
|
#define coresight_simple_reg64(type, name, lo_off, hi_off) \
|
|
__coresight_simple_func(type, NULL, name, lo_off, hi_off)
|
|
|
|
extern const u32 barrier_pkt[4];
|
|
#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt))
|
|
|
|
enum etm_addr_type {
|
|
ETM_ADDR_TYPE_NONE,
|
|
ETM_ADDR_TYPE_SINGLE,
|
|
ETM_ADDR_TYPE_RANGE,
|
|
ETM_ADDR_TYPE_START,
|
|
ETM_ADDR_TYPE_STOP,
|
|
};
|
|
|
|
enum cs_mode {
|
|
CS_MODE_DISABLED,
|
|
CS_MODE_SYSFS,
|
|
CS_MODE_PERF,
|
|
};
|
|
|
|
/**
|
|
* struct cs_buffer - keep track of a recording session' specifics
|
|
* @cur: index of the current buffer
|
|
* @nr_pages: max number of pages granted to us
|
|
* @offset: offset within the current buffer
|
|
* @data_size: how much we collected in this run
|
|
* @snapshot: is this run in snapshot mode
|
|
* @data_pages: a handle the ring buffer
|
|
*/
|
|
struct cs_buffers {
|
|
unsigned int cur;
|
|
unsigned int nr_pages;
|
|
unsigned long offset;
|
|
local_t data_size;
|
|
bool snapshot;
|
|
void **data_pages;
|
|
};
|
|
|
|
static inline void coresight_insert_barrier_packet(void *buf)
|
|
{
|
|
if (buf)
|
|
memcpy(buf, barrier_pkt, CORESIGHT_BARRIER_PKT_SIZE);
|
|
}
|
|
|
|
|
|
static inline void CS_LOCK(void __iomem *addr)
|
|
{
|
|
do {
|
|
/* Wait for things to settle */
|
|
mb();
|
|
writel_relaxed(0x0, addr + CORESIGHT_LAR);
|
|
} while (0);
|
|
}
|
|
|
|
static inline void CS_UNLOCK(void __iomem *addr)
|
|
{
|
|
do {
|
|
writel_relaxed(CORESIGHT_UNLOCK, addr + CORESIGHT_LAR);
|
|
/* Make sure everyone has seen this */
|
|
mb();
|
|
} while (0);
|
|
}
|
|
|
|
static inline u64
|
|
coresight_read_reg_pair(void __iomem *addr, s32 lo_offset, s32 hi_offset)
|
|
{
|
|
u64 val;
|
|
|
|
val = readl_relaxed(addr + lo_offset);
|
|
val |= (hi_offset < 0) ? 0 :
|
|
(u64)readl_relaxed(addr + hi_offset) << 32;
|
|
return val;
|
|
}
|
|
|
|
static inline void coresight_write_reg_pair(void __iomem *addr, u64 val,
|
|
s32 lo_offset, s32 hi_offset)
|
|
{
|
|
writel_relaxed((u32)val, addr + lo_offset);
|
|
if (hi_offset >= 0)
|
|
writel_relaxed((u32)(val >> 32), addr + hi_offset);
|
|
}
|
|
|
|
void coresight_disable_path(struct list_head *path);
|
|
int coresight_enable_path(struct list_head *path, u32 mode, void *sink_data);
|
|
struct coresight_device *coresight_get_sink(struct list_head *path);
|
|
struct coresight_device *coresight_get_enabled_sink(bool reset);
|
|
struct coresight_device *coresight_get_sink_by_id(u32 id);
|
|
struct list_head *coresight_build_path(struct coresight_device *csdev,
|
|
struct coresight_device *sink);
|
|
void coresight_release_path(struct list_head *path);
|
|
|
|
#ifdef CONFIG_CORESIGHT_SOURCE_ETM3X
|
|
extern int etm_readl_cp14(u32 off, unsigned int *val);
|
|
extern int etm_writel_cp14(u32 off, u32 val);
|
|
#else
|
|
static inline int etm_readl_cp14(u32 off, unsigned int *val) { return 0; }
|
|
static inline int etm_writel_cp14(u32 off, u32 val) { return 0; }
|
|
#endif
|
|
|
|
/*
|
|
* Macros and inline functions to handle CoreSight UCI data and driver
|
|
* private data in AMBA ID table entries, and extract data values.
|
|
*/
|
|
|
|
/* coresight AMBA ID, no UCI, no driver data: id table entry */
|
|
#define CS_AMBA_ID(pid) \
|
|
{ \
|
|
.id = pid, \
|
|
.mask = 0x000fffff, \
|
|
}
|
|
|
|
/* coresight AMBA ID, UCI with driver data only: id table entry. */
|
|
#define CS_AMBA_ID_DATA(pid, dval) \
|
|
{ \
|
|
.id = pid, \
|
|
.mask = 0x000fffff, \
|
|
.data = (void *)&(struct amba_cs_uci_id) \
|
|
{ \
|
|
.data = (void *)dval, \
|
|
} \
|
|
}
|
|
|
|
/* coresight AMBA ID, full UCI structure: id table entry. */
|
|
#define CS_AMBA_UCI_ID(pid, uci_ptr) \
|
|
{ \
|
|
.id = pid, \
|
|
.mask = 0x000fffff, \
|
|
.data = (void *)uci_ptr \
|
|
}
|
|
|
|
/* extract the data value from a UCI structure given amba_id pointer. */
|
|
static inline void *coresight_get_uci_data(const struct amba_id *id)
|
|
{
|
|
if (id->data)
|
|
return ((struct amba_cs_uci_id *)(id->data))->data;
|
|
return 0;
|
|
}
|
|
|
|
void coresight_release_platform_data(struct coresight_platform_data *pdata);
|
|
|
|
#endif
|