Commit 5bb5117b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'coresight-next-v6.6' of... 

Merge tag 'coresight-next-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux

 into char-misc-next

Suzuki writes:

coresigh: Updates for v6.6

Coresight and hwtracing subsystem updates for Linux v6.6 includes:

 - ACPI support for CoreSight ETMv4x via system instructions and Arm ETE (v9.x).
 - Fix potential sleeping in atomic context for TRBE driver
 - Fix memory leak in ACPI platform parsing code
 - Fix all warnings with W=1
 - Fix warning with double free attempt for TRBE platform data
 - Miscellaneous cleanups and fixes

 Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>

* tag 'coresight-next-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux:
  coresight: trbe: Fix TRBE potential sleep in atomic context
  coresight: Fix memory leak in acpi_buffer->pointer
  coresight: etm4x: Ensure valid drvdata and clock before clk_put()
  coresight: trbe: Allocate platform data per device
  hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code
  coresight: dummy: simplify the code with module_platform_driver
  coresight: tmc: Explicit type conversions to prevent integer overflow
  coresight: trbe: Directly use ID_AA64DFR0_EL1_TraceBuffer_IMP
  coresight: Fix all W=1 build warnings
  coresight: etm4x: Add ACPI support in platform driver
  coresight: platform: acpi: Ignore the absence of graph
  coresight: etm4x: Change etm4_platform_driver driver for MMIO devices
  coresight: etm4x: Drop pid argument from etm4_probe()
  coresight: etm4x: Drop iomem 'base' argument from etm4_probe()
  coresight: etm4x: Allocate and device assign 'struct etmv4_drvdata' earlier
  hwtracing: coresight: Explicitly include correct DT includes
parents a65ce157 c0a232f1

drivers/acpi/acpi_amba.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
static const struct acpi_device_id amba_id_list[] = {

	{"ARMH0061", 0}, /* PL061 GPIO Device */

	{"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */

	{"ARMHC500", 0}, /* ARM CoreSight ETM4x */

	{"ARMHC501", 0}, /* ARM CoreSight ETR */

	{"ARMHC502", 0}, /* ARM CoreSight STM */

	{"ARMHC503", 0}, /* ARM CoreSight Debug */

drivers/hwtracing/coresight/coresight-core.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/mutex.h>

#include <linux/clk.h>

#include <linux/coresight.h>

#include <linux/of_platform.h>

#include <linux/property.h>

#include <linux/delay.h>

#include <linux/pm_runtime.h>

drivers/hwtracing/coresight/coresight-cti-core.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "coresight-priv.h"

#include "coresight-cti.h"



/**

/*

 * CTI devices can be associated with a PE, or be connected to CoreSight

 * hardware. We have a list of all CTIs irrespective of CPU bound or

 * otherwise.

drivers/hwtracing/coresight/coresight-dummy.c

+1 −11
Original line number Diff line number Diff line
@@ -147,17 +147,7 @@ static struct platform_driver dummy_driver = { 
	},

};



static int __init dummy_init(void)

{

	return platform_driver_register(&dummy_driver);

}

module_init(dummy_init);



static void __exit dummy_exit(void)

{

	platform_driver_unregister(&dummy_driver);

}

module_exit(dummy_exit);

module_platform_driver(dummy_driver);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("CoreSight dummy driver");

drivers/hwtracing/coresight/coresight-etm4x-cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 * Invalid offsets will result in fail code return and feature load failure.

 *

 * @drvdata:	driver data to map into.

 * @reg:	register to map.

 * @reg_csdev:	register to map.

 * @offset:	device offset for the register

 */

static int etm4_cfg_map_reg_offset(struct etmv4_drvdata *drvdata,
@@ -132,7 +132,7 @@ static int etm4_cfg_map_reg_offset(struct etmv4_drvdata *drvdata, 
 * etm4_cfg_load_feature - load a feature into a device instance.

 *

 * @csdev:	An ETMv4 CoreSight device.

 * @feat:	The feature to be loaded.

 * @feat_csdev:	The feature to be loaded.

 *

 * The function will load a feature instance into the device, checking that

 * the register definitions are valid for the device.