Skip to content

Commit b1edc43

Browse files
author
CKI KWF Bot
committed
Merge: Update drivers/base to match Linux v6.17
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7309 Resolves: RHEL-109251 JIRA: https://issues.redhat.com/browse/RHEL-109251 JIRA: https://issues.redhat.com/browse/RHEL-81536 Omitted-fix: b57d5ff ("ARM: sa1100: make match function take a const pointer") Omitted-fix: abfceba ("ARM: riscpc: ecard: Fix the build") Omitted-fix: cdd1fa9 ("mips: sgi-ip22: Fix the build") Omitted-fix: c94cf02 ("m68k: defconfig: Update defconfigs for v6.14-rc1") all 4 of these commits apply to architectures that aren't supported Omitted-fix: ce32eff ("staging: greybus: gbphy: fix up const issue with the match callback") fix is in staging and applies to the Greybus driver, which is not supported by centos-stream-9 Omitted-fix: 91314e7 ("drm/amd/display: Fix failure to read vram info due to static BP_RESULT") Omitted-fix: bd4b125 ("drm/amd/display: fix missing .is_two_pixels_per_container") Omitted-fix: d75dec1 ("drm/i915: Allow NULL memory region") Omitted-fix: 7ac7461 ("drm/xe: Don't allow evicting of BOs in same VM in array of VM binds") Omitted-fix: 1852d27 ("drm/xe: Enable media sampler power gating") Omitted-fix: ca5442e ("drm/bridge-connector: Fix double free in error handling paths") Omitted-fix: 90521df ("drm/xe: Take job list lock in xe_sched_add_pending_job") Omitted-fix: 8a5ae92 ("drm/amdgpu: partially revert powerplay `__counted_by` changes") Omitted-fix: 3318ba9 ("drm/amdgpu: Add a lock when accessing the buddy trim function") Omitted-fix: f673055 ("drm/imx: Add missing DRM_BRIDGE_CONNECTOR dependency") Omitted-fix: 4a33aa3 ("drm/display: fix kerneldocs references") Omitted-fix: ca2a6ab ("drm/panthor: Fix memory leak in panthor_ioctl_group_create()") applied, possibly under a different hash, as part of various DRM merge commits skipped commit 5bc493b "regmap: sdw-mbq: Add support for SDCA deferred controls" because it required bringing in the entirely SDCA sound infrastructure, which was a dozen or more commits otherwise unrelated to this MR. skipped commit 180bbad "arch_numa: Restore nid checks before registering a memblock with a node" because it fixes an issue with numa_memblks, and without that code, causes silent boot crashes. Adding num_memblks support is well beyond the scope of this MR. Maintenance backports to bring RHEL-9.8 drivers/base code in line with upstream v6.17. Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: John Meneghini <jmeneghi@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: Vladis Dronov <vdronov@redhat.com> Approved-by: Mika Penttilä <mpenttil@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Audra Mitchell <aubaker@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Ivan Vecera <ivecera@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents fba0ff7 + 2b3a645 commit b1edc43

File tree

303 files changed

+4057
-2316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+4057
-2316
lines changed

‎Documentation/ABI/testing/sysfs-devices-system-cpu‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,3 +703,9 @@ Description:
703703
(RO) indicates whether or not the kernel updates relevant kexec
704704
segments on memory hot un/plug and/or on/offline events, avoiding the
705705
need to reload kdump kernel.
706+
707+
What: /sys/devices/system/cpu/enabled
708+
Date: Nov 2022
709+
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
710+
Description:
711+
(RO) the list of CPUs that can be brought online.

‎Documentation/driver-api/auxiliary_bus.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Auxiliary Device Creation
2323

2424
.. kernel-doc:: drivers/base/auxiliary.c
2525
:identifiers: auxiliary_device_init __auxiliary_device_add
26-
auxiliary_find_device
2726

2827
Auxiliary Device Memory Model and Lifespan
2928
------------------------------------------

‎Documentation/driver-api/infrastructure.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ Device Drivers Base
2626
.. kernel-doc:: drivers/base/class.c
2727
:export:
2828

29+
.. kernel-doc:: include/linux/device/faux.h
30+
:internal:
31+
32+
.. kernel-doc:: drivers/base/faux.c
33+
:export:
34+
2935
.. kernel-doc:: drivers/base/node.c
3036
:internal:
3137

‎arch/arm/common/locomo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@ EXPORT_SYMBOL(locomo_frontlight_set);
815815
* We model this as a regular bus type, and hang devices directly
816816
* off this.
817817
*/
818-
static int locomo_match(struct device *_dev, struct device_driver *_drv)
818+
static int locomo_match(struct device *_dev, const struct device_driver *_drv)
819819
{
820820
struct locomo_dev *dev = LOCOMO_DEV(_dev);
821-
struct locomo_driver *drv = LOCOMO_DRV(_drv);
821+
const struct locomo_driver *drv = LOCOMO_DRV(_drv);
822822

823823
return dev->devid == drv->devid;
824824
}

‎arch/arm/include/asm/hardware/locomo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ struct locomo_driver {
191191
void (*remove)(struct locomo_dev *);
192192
};
193193

194-
#define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv)
194+
#define LOCOMO_DRV(_d) container_of_const((_d), struct locomo_driver, drv)
195195

196196
#define LOCOMO_DRIVER_NAME(_ldev) ((_ldev)->dev.driver->name)
197197

‎arch/parisc/include/asm/parisc-device.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct parisc_driver {
4141

4242

4343
#define to_parisc_device(d) container_of(d, struct parisc_device, dev)
44-
#define to_parisc_driver(d) container_of(d, struct parisc_driver, drv)
44+
#define to_parisc_driver(d) container_of_const(d, struct parisc_driver, drv)
4545
#define parisc_parent(d) to_parisc_device(d->dev.parent)
4646

4747
static inline const char *parisc_pathname(struct parisc_device *d)

‎arch/parisc/kernel/drivers.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static int for_each_padev(int (*fn)(struct device *, void *), void * data)
9797
* @driver: the PA-RISC driver to try
9898
* @dev: the PA-RISC device to try
9999
*/
100-
static int match_device(struct parisc_driver *driver, struct parisc_device *dev)
100+
static int match_device(const struct parisc_driver *driver, struct parisc_device *dev)
101101
{
102102
const struct parisc_device_id *ids;
103103

@@ -548,7 +548,7 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
548548
return dev;
549549
}
550550

551-
static int parisc_generic_match(struct device *dev, struct device_driver *drv)
551+
static int parisc_generic_match(struct device *dev, const struct device_driver *drv)
552552
{
553553
return match_device(to_parisc_driver(drv), to_parisc_device(dev));
554554
}

‎arch/powerpc/include/asm/ps3.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev);
390390
int ps3_system_bus_driver_register(struct ps3_system_bus_driver *drv);
391391
void ps3_system_bus_driver_unregister(struct ps3_system_bus_driver *drv);
392392

393-
static inline struct ps3_system_bus_driver *ps3_drv_to_system_bus_drv(
394-
struct device_driver *_drv)
395-
{
396-
return container_of(_drv, struct ps3_system_bus_driver, core);
397-
}
393+
#define ps3_drv_to_system_bus_drv(_drv) container_of_const(_drv, struct ps3_system_bus_driver, core)
398394
static inline struct ps3_system_bus_device *ps3_dev_to_system_bus_dev(
399395
const struct device *_dev)
400396
{

‎arch/powerpc/include/asm/vio.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,7 @@ static inline int vio_enable_interrupts(struct vio_dev *dev)
156156
}
157157
#endif
158158

159-
static inline struct vio_driver *to_vio_driver(struct device_driver *drv)
160-
{
161-
return container_of(drv, struct vio_driver, driver);
162-
}
163-
159+
#define to_vio_driver(__drv) container_of_const(__drv, struct vio_driver, driver)
164160
#define to_vio_dev(__dev) container_of_const(__dev, struct vio_dev, dev)
165161

166162
#endif /* __KERNEL__ */

‎arch/powerpc/perf/hv-24x7.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,6 @@ static char *memdup_to_str(char *maybe_str, int max_len, gfp_t gfp)
438438
return kasprintf(gfp, "%.*s", max_len, maybe_str);
439439
}
440440

441-
static ssize_t device_show_string(struct device *dev,
442-
struct device_attribute *attr, char *buf)
443-
{
444-
struct dev_ext_attribute *d;
445-
446-
d = container_of(attr, struct dev_ext_attribute, attr);
447-
448-
return sprintf(buf, "%s\n", (char *)d->var);
449-
}
450-
451441
static ssize_t cpumask_show(struct device *dev,
452442
struct device_attribute *attr, char *buf)
453443
{

0 commit comments

Comments
 (0)