stm class/intel_th: Updates for v6.10
Alexander Shishkin
maintainercover stm class/intel_th: Updates for v6.10
Hi Greg,
Here are the patches I have for the next cycle. The bulk of them are new PCI IDs. Besides that, there are cosmetic changes, one actual bugfix and a new feature added to the SyS-T protocol driver that uses a specially designated format for ftrace data. I dropped Uwe's patch as he'd resent it himself earlier today. Please consider applying. Thanks!
Alexander Shishkin (6):
intel_th: pci: Add Granite Rapids support
intel_th: pci: Add Granite Rapids SOC support
intel_th: pci: Add Sapphire Rapids SOC support
intel_th: pci: Add Meteor Lake-S support
intel_th: pci: Add Meteor Lake-S CPU support
intel_th: pci: Add Lunar Lake support
Colin Ian King (1):
intel_th: Remove redundant initialization of pointer outp
Dan Carpenter (1):
stm class: Fix a double free in stm_register_device()
Li Zhijian (1):
intel_th: Convert sprintf/snprintf to sysfs_emit
Mikhail Lappo (3):
stm class: Add source type
stm class: Propagate source type to protocols stm class: sys-t: Improve ftrace source handling
Randy Dunlap (1):
intel_th: msu: Fix kernel-doc warnings
Ricardo B. Marliere (1):
intel_th: Constify the struct device_type usage
drivers/hwtracing/intel_th/core.c | 8 +-- drivers/hwtracing/intel_th/gth.c | 8 +-- drivers/hwtracing/intel_th/msu.c | 12 +++- drivers/hwtracing/intel_th/pci.c | 30 ++++++++++ drivers/hwtracing/intel_th/sth.c | 2 +- drivers/hwtracing/stm/console.c | 1 + drivers/hwtracing/stm/core.c | 19 ++++--- drivers/hwtracing/stm/ftrace.c | 1 + drivers/hwtracing/stm/heartbeat.c | 1 + drivers/hwtracing/stm/p_basic.c | 3 +- drivers/hwtracing/stm/p_sys-t.c | 93 ++++++++++++++++++++++++++++--- drivers/hwtracing/stm/stm.h | 2 +- include/linux/stm.h | 12 ++++ 13 files changed, 162 insertions(+), 30 deletions(-)
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 1/14 stm class: Fix a double free in stm_register_device()
From: Dan Carpenter <[email protected]>
The put_device(&stm->dev) call will trigger stm_device_release() which frees "stm" so the vfree(stm) on the next line is a double free.
--- drivers/hwtracing/stm/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/hwtracing/stm/core.c +6 -5
@@ -868,8 +868,11 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data,return -ENOMEM ; stm->major =register_chrdev (0 , stm_data->name, &stm_fops); -if (stm->major <0 ) - goto err_free; +if (stm->major <0 ) { + err = stm->major; +vfree (stm); +return err; + }device_initialize (&stm->dev); stm->dev.devt =MKDEV (stm->major,0 );
@@ -913,10 +916,8 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, err_device:unregister_chrdev (stm->major, stm_data->name); -/* matches device_initialize() above */ +/* calls stm_device_release() */ put_device (&stm->dev); -err_free: -vfree (stm);return err; }
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 2/14 stm class: Add source type
In reply to Alexander ShishkinFrom: Mikhail Lappo <[email protected]>
Currently kernel HW tracing infrastrtucture and specifically its SyS-T part treats all source data in the same way. Treating and encoding different trace data sources differently might allow decoding software to make use of e.g. ftrace event ids by converting them to a SyS-T message catalog.
The solution is to keep source type stored within stm_source_data structure to allow different handling by stm output/protocol. Currently we only differentiate between STM_USER and STM_FTRACE sources.
--- drivers/hwtracing/stm/console.c | 1 + drivers/hwtracing/stm/ftrace.c | 1 + drivers/hwtracing/stm/heartbeat.c | 1 + include/linux/stm.h | 12 ++++++++++++ 4 files changed, 15 insertions(+)
drivers/hwtracing/stm/console.c +1 -0
@@ -22,6 +22,7 @@ static struct stm_console { .data = { .name = "console", .nr_chans = 1, + .type = STM_USER, .link = stm_console_link, .unlink = stm_console_unlink, },
drivers/hwtracing/stm/ftrace.c +1 -0
@@ -23,6 +23,7 @@ static struct stm_ftrace { .data = { .name = "ftrace", .nr_chans = STM_FTRACE_NR_CHANNELS, + .type = STM_FTRACE, .link = stm_ftrace_link, .unlink = stm_ftrace_unlink, },
drivers/hwtracing/stm/heartbeat.c +1 -0
@@ -78,6 +78,7 @@ static int stm_heartbeat_init(void) } stm_heartbeat[i].data.nr_chans =1 ; + stm_heartbeat[i].data.type =STM_USER ; stm_heartbeat[i].data.link = stm_heartbeat_link; stm_heartbeat[i].data.unlink = stm_heartbeat_unlink; hrtimer_init(&stm_heartbeat[i].hrtimer, CLOCK_MONOTONIC,
include/linux/stm.h +12 -0
@@ -30,6 +30,16 @@ enum stp_packet_flags { STP_PACKET_TIMESTAMPED = 0x2, }; +/** +* enum stm_source_type - STM source driver +* @STM_USER: any STM trace source +* @STM_FTRACE: ftrace STM source +*/ +enum stm_source_type { +STM_USER , +STM_FTRACE , +}; +struct stp_policy ;struct stm_device ;
@@ -106,6 +116,7 @@ struct stm_source_device;* @name: device name, will be used for policy lookup * @src: internal structure, only used by stm class code * @nr_chans: number of channels to allocate +* @type: type of STM source driver represented by stm_source_type * @link: called when this source gets linked to an STM device * @unlink: called when this source is about to get unlinked from its STM *
@@ -117,6 +128,7 @@ struct stm_source_data {struct stm_source_device *src;unsigned int percpu;unsigned int nr_chans; +unsigned int type;int (*link)(struct stm_source_data *data);void (*unlink)(struct stm_source_data *data); };
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 3/14 stm class: Propagate source type to protocols
In reply to Alexander ShishkinFrom: Mikhail Lappo <[email protected]>
Pass stm source type via stm_write() to allow different handling on protocol level.
The measure above should allow protocol level encoder to differentiate and accordingly pack the messages. As an example SyS-T might get use of ftrace message ID's and instead of applying regular header, pack them as SyS-T catalog or SyS-T Structured Binary Data message to allow proper decoding on the other side.
--- drivers/hwtracing/stm/core.c | 8 ++++---- drivers/hwtracing/stm/p_basic.c | 3 ++- drivers/hwtracing/stm/p_sys-t.c | 3 ++- drivers/hwtracing/stm/stm.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-)
drivers/hwtracing/stm/core.c +4 -4
@@ -600,7 +600,7 @@ EXPORT_SYMBOL_GPL(stm_data_write); static ssize_t notracestm_write (struct stm_device *stm,struct stm_output *output, -unsigned int chan,const char *buf,size_t count) +unsigned int chan,const char *buf,size_t count,struct stm_source_data *source) {int err;
@@ -608,7 +608,7 @@ stm_write(struct stm_device *stm, struct stm_output *output,if (!stm->pdrv)return -ENODEV ; - err = stm->pdrv->write (stm->data, output, chan, buf, count); + err = stm->pdrv->write (stm->data, output, chan, buf, count, source);if (err <0 )return err;
@@ -657,7 +657,7 @@ static ssize_t stm_char_write(struct file *file, const char __user *buf,pm_runtime_get_sync (&stm->dev); - count =stm_write (stm, &stmf->output,0 , kbuf, count); + count =stm_write (stm, &stmf->output,0 , kbuf, count,NULL );pm_runtime_mark_last_busy (&stm->dev);pm_runtime_put_autosuspend (&stm->dev);
@@ -1299,7 +1299,7 @@ int notrace stm_source_write(struct stm_source_data *data, stm =srcu_dereference (src->link, &stm_source_srcu);if (stm) - count =stm_write (stm, &src->output, chan, buf, count); + count =stm_write (stm, &src->output, chan, buf, count, data);else count = -ENODEV ;
drivers/hwtracing/stm/p_basic.c +2 -1
@@ -10,7 +10,8 @@#include "stm.h" static ssize_t basic_write (struct stm_data *data,struct stm_output *output, -unsigned int chan,const char *buf,size_t count) +unsigned int chan,const char *buf,size_t count, +struct stm_source_data *source) {unsigned int c = output->channel + chan;unsigned int m = output->master;
drivers/hwtracing/stm/p_sys-t.c +2 -1
@@ -285,7 +285,8 @@ sys_t_clock_sync(struct stm_data *data, unsigned int m, unsigned int c) }static ssize_t sys_t_write (struct stm_data *data,struct stm_output *output, -unsigned int chan,const char *buf,size_t count) +unsigned int chan,const char *buf,size_t count, +struct stm_source_data *source) {struct sys_t_output *op = output->pdrv_private;unsigned int c = output->channel + chan;
drivers/hwtracing/stm/stm.h +1 -1
@@ -96,7 +96,7 @@ struct stm_protocol_driver {const char *name;ssize_t (*write)(struct stm_data *data,struct stm_output *output,unsigned int chan, -const char *buf,size_t count); +const char *buf,size_t count,struct stm_source_data *source);void (*policy_node_init)(void *arg);int (*output_open)(void *priv,struct stm_output *output);void (*output_close)(struct stm_output *output);
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 4/14 stm class: sys-t: Improve ftrace source handling
In reply to Alexander ShishkinFrom: Mikhail Lappo <[email protected]>
Package messages from ftrace source with SyS-T Structured Binary Data (later SBD) header and 64-bit ID. This provides modification-free compatibility between ftrace and SyS-T arguments structure by applying 0xFFFF mask on message ID.
This happens due to the fact that SBD and ftrace structures have the same principle of data storage: <header><args binary blob>.
The headers are bit-to-bit compatible and both contain event/catalog ID with the exception, that ftrace header contains more fields within 64 bits which needs to be masked during encoding process, since SBD standard doesn't support mask of ID field.
0 15 16 23 24 31 32 39 40 63 ftrace: <event_id> <flags> <preempt> <-pid-> <---->
SBD: <------- msg_id ------------------------------>
--- drivers/hwtracing/stm/p_sys-t.c | 90 ++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 7 deletions(-)
drivers/hwtracing/stm/p_sys-t.c +83 -7
@@ -20,6 +20,7 @@ enum sys_t_message_type {MIPI_SYST_TYPE_RAW =6 ,MIPI_SYST_TYPE_SHORT64 ,MIPI_SYST_TYPE_CLOCK , + MIPI_SYST_TYPE_SBD, }; enum sys_t_message_severity {
@@ -53,6 +54,19 @@ enum sys_t_message_string_subtype { MIPI_SYST_STRING_PRINTF_64 = 12, }; +/** +* enum sys_t_message_sbd_subtype - SyS-T SBD message subtypes +* @MIPI_SYST_SBD_ID32: SBD message with 32-bit message ID +* @MIPI_SYST_SBD_ID64: SBD message with 64-bit message ID +* +* Structured Binary Data messages can send information of arbitrary length, +* together with ID's that describe BLOB's content and layout. +*/ +enum sys_t_message_sbd_subtype { +MIPI_SYST_SBD_ID32 =0 , +MIPI_SYST_SBD_ID64 =1 , +}; +#define MIPI_SYST_TYPE (t) ((u32)(MIPI_SYST_TYPE_ ## t))#define MIPI_SYST_SEVERITY (s) ((u32)(MIPI_SYST_SEVERITY_ ## s) << 4)#define MIPI_SYST_OPT_LOC BIT(8)
@@ -75,6 +89,20 @@ enum sys_t_message_string_subtype {#define CLOCK_SYNC_HEADER (MIPI_SYST_TYPES(CLOCK, TRANSPORT_SYNC) | \ MIPI_SYST_SEVERITY(MAX)) +/* +* SyS-T and ftrace headers are compatible to an extent that ftrace event ID +* and args can be treated as SyS-T SBD message with 64-bit ID and arguments +* BLOB right behind the header without modification. Bits [16:63] coming +* together with message ID from ftrace aren't used by SBD and must be zeroed. +* +* 0 15 16 23 24 31 32 39 40 63 +* ftrace: <event_id> <flags> <preempt> <-pid-> <----> <args> +* SBD: <------- msg_id ------------------------------> <BLOB> +*/ +#define SBD_HEADER (MIPI_SYST_TYPES(SBD, ID64) | \ + MIPI_SYST_SEVERITY(INFO) | \ + MIPI_SYST_OPT_GUID) +struct sys_t_policy_node {uuid_t uuid;bool do_len;
@@ -284,6 +312,59 @@ sys_t_clock_sync(struct stm_data *data, unsigned int m, unsigned int c)return sizeof (header) +sizeof (payload); } +static inline u32 sys_t_header (struct stm_source_data *source) +{ +if (source && source->type ==STM_FTRACE ) +return SBD_HEADER ; +return DATA_HEADER ; +} + +static ssize_t sys_t_write_data (struct stm_data *data, +struct stm_source_data *source, +unsigned int master,unsigned int channel, +bool ts_first,const void *buf,size_t count) +{ +ssize_t sz; +const unsigned char nil =0 ; + +/* +* Ftrace is zero-copy compatible with SyS-T SBD, but requires +* special handling of first 64 bits. Trim and send them separately +* to avoid damage on original ftrace buffer. +*/ +if (source && source->type ==STM_FTRACE ) { +u64 compat_ftrace_header; +ssize_t header_sz; +ssize_t buf_sz; + +if (count <sizeof (compat_ftrace_header)) +return -EINVAL ; + +/* SBD only makes use of low 16 bits (event ID) from ftrace event */ + compat_ftrace_header = *(u64 *)buf &0xffff ; + header_sz =stm_data_write (data, master, channel, false, + &compat_ftrace_header, +sizeof (compat_ftrace_header)); +if (header_sz !=sizeof (compat_ftrace_header)) +return header_sz; + + buf_sz =stm_data_write (data, master, channel, false, + buf + header_sz, count - header_sz); +if (buf_sz != count - header_sz) +return buf_sz; + sz = header_sz + buf_sz; + }else { + sz =stm_data_write (data, master, channel, false, buf, count); + } + +if (sz <=0 ) +return sz; + + data->packet (data, master, channel,STP_PACKET_FLAG ,0 ,0 , &nil); + +return sz; +} +static ssize_t sys_t_write (struct stm_data *data,struct stm_output *output,unsigned int chan,const char *buf,size_t count,struct stm_source_data *source)
@@ -291,8 +372,7 @@ static ssize_t sys_t_write(struct stm_data *data, struct stm_output *output,struct sys_t_output *op = output->pdrv_private;unsigned int c = output->channel + chan;unsigned int m = output->master; -const unsigned char nil =0 ; -u32 header =DATA_HEADER ; +u32 header =sys_t_header (source);u8 uuid[UUID_SIZE ];ssize_t sz;
@@ -349,11 +429,7 @@ static ssize_t sys_t_write(struct stm_data *data, struct stm_output *output, }/* DATA */ - sz =stm_data_write (data, m, c, false, buf, count); -if (sz >0 ) - data->packet (data, m, c,STP_PACKET_FLAG ,0 ,0 , &nil); - -return sz; +return sys_t_write_data (data, source, m, c, false, buf, count); }static const struct stm_protocol_driver sys_t_pdrv = {
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 5/14 intel_th: Constify the struct device_type usage
In reply to Alexander ShishkinFrom: "Ricardo B. Marliere" <[email protected]>
Since commit aed65af1cc2f ("drivers: make device_type const"), the driver core can properly handle constant struct device_type. Move the intel_th_source_device_type, intel_th_output_device_type, intel_th_switch_device_type and intel_th_device_type variables to be constant structures as well, placing it into read-only memory which can not be modified at runtime.
--- drivers/hwtracing/intel_th/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/hwtracing/intel_th/core.c +4 -4
@@ -180,7 +180,7 @@ static void intel_th_device_release(struct device *dev)intel_th_device_free (to_intel_th_device (dev)); } -static struct device_type intel_th_source_device_type = { +static const struct device_type intel_th_source_device_type = { .name ="intel_th_source_device" , .release = intel_th_device_release, };
@@ -333,19 +333,19 @@ static struct attribute *intel_th_output_attrs[] = {ATTRIBUTE_GROUPS (intel_th_output); -static struct device_type intel_th_output_device_type = { +static const struct device_type intel_th_output_device_type = { .name ="intel_th_output_device" , .groups = intel_th_output_groups, .release = intel_th_device_release, .devnode = intel_th_output_devnode, }; -static struct device_type intel_th_switch_device_type = { +static const struct device_type intel_th_switch_device_type = { .name ="intel_th_switch_device" , .release = intel_th_device_release, }; -static struct device_type *intel_th_device_type[] = { +static const struct device_type *intel_th_device_type[] = { [INTEL_TH_SOURCE ] = &intel_th_source_device_type, [INTEL_TH_OUTPUT ] = &intel_th_output_device_type, [INTEL_TH_SWITCH ] = &intel_th_switch_device_type,
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 6/14 intel_th: Convert sprintf/snprintf to sysfs_emit
In reply to Alexander ShishkinFrom: Li Zhijian <[email protected]>
Per filesystems/sysfs.rst, show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space.
coccinelle complains that there are still a couple of functions that use snprintf(). Convert them to sysfs_emit().
sprintf() will be converted as weel if they have.
Generally, this patch is generated by
make coccicheck M=<path/to/file> MODE=patch \
COCCI=scripts/coccinelle/api/device_attr_show.cocci
No functional change intended
--- drivers/hwtracing/intel_th/gth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/hwtracing/intel_th/gth.c +4 -4
@@ -154,9 +154,9 @@ static ssize_t master_attr_show(struct device *dev,spin_unlock (>h->gth_lock);if (port >=0 ) - count =snprintf (buf,PAGE_SIZE ,"%x\n" , port); + count =sysfs_emit (buf,"%x\n" , port);else - count =snprintf (buf,PAGE_SIZE ,"disabled\n" ); + count =sysfs_emit (buf,"disabled\n" );return count; }
@@ -332,8 +332,8 @@ static ssize_t output_attr_show(struct device *dev,pm_runtime_get_sync (dev);spin_lock (>h->gth_lock); - count =snprintf (buf,PAGE_SIZE ,"%x\n" , -gth_output_parm_get (gth, oa->port, oa->parm)); + count =sysfs_emit (buf,"%x\n" , +gth_output_parm_get (gth, oa->port, oa->parm));spin_unlock (>h->gth_lock);pm_runtime_put (dev);
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 7/14 intel_th: Remove redundant initialization of pointer outp
In reply to Alexander ShishkinFrom: Colin Ian King <[email protected]>
The pointer outp is being initialized with a value that is never read. All the reads of outp occur after outp has neen set to an appropriate value rather than using the first value is initialized with. The assignment is redundant and can be removed.
Cleans up clang scan warning:drivers/hwtracing/intel_th/sth.c:73:15: warning: Value stored to 'outp' during its initialization is never read [deadcode.DeadStores]
--- drivers/hwtracing/intel_th/sth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/intel_th/sth.c +1 -1
@@ -70,8 +70,8 @@ static ssize_t notrace sth_stm_packet(struct stm_data *stm_data, struct sth_device *sth = container_of(stm_data, struct sth_device, stm);struct intel_th_channel __iomem *out =sth_channel (sth, master, channel); -u64 __iomem *outp = &out->Dn;unsigned long reg =REG_STH_TRIG ; +u64 __iomem *outp;#ifndef CONFIG_64BIT if (size >4 )
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 8/14 intel_th: msu: Fix kernel-doc warnings
In reply to Alexander ShishkinFrom: Randy Dunlap <[email protected]>
Correct function comments to prevent kernel-doc warnings found when using "W=1".
msu.c:77: warning: Function parameter or member 'msc' not described in 'msc_window' msu.c:122: warning: bad line:
msu.c:760: warning: No description found for return value of 'msc_configure' msu.c:1309: warning: Function parameter or member 'nr_pages' not described in 'msc_buffer_alloc' msu.c:1309: warning: Function parameter or member 'nr_wins' not described in 'msc_buffer_alloc' msu.c:1309: warning: Excess function parameter 'size' description in 'msc_buffer_alloc' msu.c:1376: warning: No description found for return value of 'msc_buffer_free_unless_used' msu.c:1444: warning: No description found for return value of 'msc_win_to_user'
--- drivers/hwtracing/intel_th/msu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/hwtracing/intel_th/msu.c +10 -2
@@ -61,6 +61,7 @@ enum lockout_state {* @lo_lock: lockout state serialization * @nr_blocks: number of blocks (pages) in this window * @nr_segs: number of segments in this window (<= @nr_blocks) +* @msc: pointer to the MSC device * @_sgt: array of block descriptors * @sgt: array of block descriptors */
@@ -119,7 +120,6 @@ struct msc_iter {* @user_count: number of users of the buffer * @mmap_count: number of mappings * @buf_mutex: mutex to serialize access to buffer-related bits -* @enabled: MSC is enabled * @wrap: wrapping is enabled * @mode: MSC operating mode
@@ -755,6 +755,8 @@ static int msc_win_set_lockout(struct msc_window *win,* Program storage mode, wrapping, burst length and trace buffer address * into a given MSC. Then, enable tracing and set msc::enabled. * The latter is serialized on msc::buf_mutex, so make sure to hold it. +* +* Return: %0 for success or a negative error code otherwise. */ static int msc_configure (struct msc *msc) {
@@ -1291,7 +1293,8 @@ static void msc_buffer_free(struct msc *msc)/** * msc_buffer_alloc() - allocate a buffer for MSC * @msc: MSC device -* @size: allocation size in bytes +* @nr_pages: number of pages for each window +* @nr_wins: number of windows * * Allocate a storage buffer for MSC, depending on the msc::mode, it will be * either done via msc_buffer_contig_alloc() for SINGLE operation mode or
@@ -1370,6 +1373,9 @@ static int msc_buffer_unlocked_free_unless_used(struct msc *msc)* @msc: MSC device * * This is a locked version of msc_buffer_unlocked_free_unless_used(). +* +* Return: 0 on successful deallocation or if there was no buffer to +* deallocate, -EBUSY if there are active users. */ static int msc_buffer_free_unless_used (struct msc *msc) {
@@ -1438,6 +1444,8 @@ struct msc_win_to_user_struct {* @data: callback's private data * @src: source buffer * @len: amount of data to copy from the source buffer +* +* Return: >= %0 for success or -errno for error. */ static unsigned long msc_win_to_user (void *data,void *src,size_t len) {
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 9/14 intel_th: pci: Add Granite Rapids support
In reply to Alexander ShishkinAdd support for the Trace Hub in Granite Rapids.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -299,6 +299,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa76f), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Granite Rapids */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x0963 ), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, {/* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f),
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 10/14 intel_th: pci: Add Granite Rapids SOC support
In reply to Alexander ShishkinAdd support for the Trace Hub in Granite Rapids SOC.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -304,6 +304,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0963), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Granite Rapids SOC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x3256 ), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, {/* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f),
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 11/14 intel_th: pci: Add Sapphire Rapids SOC support
In reply to Alexander ShishkinAdd support for the Trace Hub in Sapphire Rapids SOC.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -309,6 +309,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3256), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Sapphire Rapids SOC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x3456 ), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, {/* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f),
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 12/14 intel_th: pci: Add Meteor Lake-S support
In reply to Alexander ShishkinAdd support for the Trace Hub in Meteor Lake-S.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -289,6 +289,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7e24), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Meteor Lake-S */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x7f26 ), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, {/* Raptor Lake-S */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7a26),
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 13/14 intel_th: pci: Add Meteor Lake-S CPU support
In reply to Alexander ShishkinAdd support for the Trace Hub in Meteor Lake-S CPU.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -294,6 +294,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7f26), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Meteor Lake-S CPU */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xae24 ), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, {/* Raptor Lake-S */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7a26),
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerPATCH 14/14 intel_th: pci: Add Lunar Lake support
In reply to Alexander ShishkinAdd support for the Trace Hub in Lunar Lake.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -324,6 +324,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3456), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Lunar Lake */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xa824 ), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, {/* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f),
Signature · 1 line
2.43.0
Alexander Shishkin
maintainerQuoted 7 lines · Alexander Shishkin
Hi Greg,
Here are the patches I have for the next cycle. The bulk of them are new PCI IDs. Besides that, there are cosmetic changes, one actual bugfix and a new feature added to the SyS-T protocol driver that uses a specially designated format for ftrace data. I dropped Uwe's patch as he'd resent it himself earlier today.
Please disregard this series. Dropping Uwe's patch was me failing at email. I've sent a new one that includes said patch [0]. Please consider that one instead.
[0] https://lore.kernel.org/all/[email protected]/
Thanks,
--
Alex