mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/perf/arm-cci.c
..
..
@@ -1327,15 +1327,6 @@
1327
1327
 	if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
1328
1328
 		return -EOPNOTSUPP;
1329
1329
 
1330
-	/* We have no filtering of any kind */
1331
-	if (event->attr.exclude_user	||
1332
-	    event->attr.exclude_kernel	||
1333
-	    event->attr.exclude_hv	||
1334
-	    event->attr.exclude_idle	||
1335
-	    event->attr.exclude_host	||
1336
-	    event->attr.exclude_guest)
1337
-		return -EINVAL;
1338
-
1339
1330
 	/*
1340
1331
 	 * Following the example set by other "uncore" PMUs, we accept any CPU
1341
1332
 	 * and rewrite its affinity dynamically rather than having perf core
..
..
@@ -1433,6 +1424,7 @@
1433
1424
 		.stop		= cci_pmu_stop,
1434
1425
 		.read		= pmu_read,
1435
1426
 		.attr_groups	= pmu_attr_groups,
1427
+		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,
1436
1428
 	};
1437
1429
 
1438
1430
 	cci_pmu->plat_device = pdev;
..
..
@@ -1650,7 +1642,6 @@
1650
1642
 
1651
1643
 static int cci_pmu_probe(struct platform_device *pdev)
1652
1644
 {
1653
-	struct resource *res;
1654
1645
 	struct cci_pmu *cci_pmu;
1655
1646
 	int i, ret, irq;
1656
1647
 
..
..
@@ -1658,8 +1649,7 @@
1658
1649
 	if (IS_ERR(cci_pmu))
1659
1650
 		return PTR_ERR(cci_pmu);
1660
1651
 
1661
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1662
-	cci_pmu->base = devm_ioremap_resource(&pdev->dev, res);
1652
+	cci_pmu->base = devm_platform_ioremap_resource(pdev, 0);
1663
1653
 	if (IS_ERR(cci_pmu->base))
1664
1654
 		return -ENOMEM;
1665
1655
 
..
..
@@ -1728,6 +1718,7 @@
1728
1718
 	.driver = {
1729
1719
 		   .name = DRIVER_NAME,
1730
1720
 		   .of_match_table = arm_cci_pmu_matches,
1721
+		   .suppress_bind_attrs = true,
1731
1722
 		  },
1732
1723
 	.probe = cci_pmu_probe,
1733
1724
 	.remove = cci_pmu_remove,