Skip to content

Commit a93e884

Browse files
committed
Merge tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is the large set of driver core changes for 6.3-rc1. There's a lot of changes this development cycle, most of the work falls into two different categories: - fw_devlink fixes and updates. This has gone through numerous review cycles and lots of review and testing by lots of different devices. Hopefully all should be good now, and Saravana will be keeping a watch for any potential regression on odd embedded systems. - driver core changes to work to make struct bus_type able to be moved into read-only memory (i.e. const) The recent work with Rust has pointed out a number of areas in the driver core where we are passing around and working with structures that really do not have to be dynamic at all, and they should be able to be read-only making things safer overall. This is the contuation of that work (started last release with kobject changes) in moving struct bus_type to be constant. We didn't quite make it for this release, but the remaining patches will be finished up for the release after this one, but the groundwork has been laid for this effort. Other than that we have in here: - debugfs memory leak fixes in some subsystems - error path cleanups and fixes for some never-able-to-be-hit codepaths. - cacheinfo rework and fixes - Other tiny fixes, full details are in the shortlog All of these have been in linux-next for a while with no reported problems" [ Geert Uytterhoeven points out that that last sentence isn't true, and that there's a pending report that has a fix that is queued up - Linus ] * tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (124 commits) debugfs: drop inline constant formatting for ERR_PTR(-ERROR) OPP: fix error checking in opp_migrate_dentry() debugfs: update comment of debugfs_rename() i3c: fix device.h kernel-doc warnings dma-mapping: no need to pass a bus_type into get_arch_dma_ops() driver core: class: move EXPORT_SYMBOL_GPL() lines to the correct place Revert "driver core: add error handling for devtmpfs_create_node()" Revert "devtmpfs: add debug info to handle()" Revert "devtmpfs: remove return value of devtmpfs_delete_node()" driver core: cpu: don't hand-override the uevent bus_type callback. devtmpfs: remove return value of devtmpfs_delete_node() devtmpfs: add debug info to handle() driver core: add error handling for devtmpfs_create_node() driver core: bus: update my copyright notice driver core: bus: add bus_get_dev_root() function driver core: bus: constify bus_unregister() driver core: bus: constify some internal functions driver core: bus: constify bus_get_kset() driver core: bus: constify bus_register/unregister_notifier() driver core: remove private pointer from struct bus_type ...
2 parents 693fed9 + 88cd618 commit a93e884

File tree

182 files changed

+1532
-1186
lines changed

Some content is hidden

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

182 files changed

+1532
-1186
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /sys/kernel/address_bit
2+
Date: May 2023
3+
KernelVersion: 6.3
4+
Contact: Thomas Weißschuh <[email protected]>
5+
Description:
6+
The address size of the running kernel in bits.
7+
8+
Access: Read
9+
10+
Users: util-linux

Documentation/process/embargoed-hardware-issues.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ an involved disclosed party. The current ambassadors list:
251251
IBM Z Christian Borntraeger <[email protected]>
252252
Intel Tony Luck <[email protected]>
253253
Qualcomm Trilok Soni <[email protected]>
254+
Samsung Javier González <[email protected]>
254255

255256
Microsoft James Morris <[email protected]>
256257
VMware

arch/alpha/include/asm/dma-mapping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
extern const struct dma_map_ops alpha_pci_ops;
66

7-
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
7+
static inline const struct dma_map_ops *get_arch_dma_ops(void)
88
{
99
#ifdef CONFIG_ALPHA_JENSEN
1010
return NULL;

arch/arm64/kernel/cacheinfo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
4646
int init_cache_level(unsigned int cpu)
4747
{
4848
unsigned int ctype, level, leaves;
49-
int fw_level;
49+
int fw_level, ret;
5050
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
5151

5252
for (level = 1, leaves = 0; level <= MAX_CACHE_LEVEL; level++) {
@@ -59,13 +59,13 @@ int init_cache_level(unsigned int cpu)
5959
leaves += (ctype == CACHE_TYPE_SEPARATE) ? 2 : 1;
6060
}
6161

62-
if (acpi_disabled)
62+
if (acpi_disabled) {
6363
fw_level = of_find_last_cache_level(cpu);
64-
else
65-
fw_level = acpi_find_last_cache_level(cpu);
66-
67-
if (fw_level < 0)
68-
return fw_level;
64+
} else {
65+
ret = acpi_get_cache_info(cpu, &fw_level, NULL);
66+
if (ret < 0)
67+
fw_level = 0;
68+
}
6969

7070
if (level < fw_level) {
7171
/*

arch/ia64/include/asm/dma-mapping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
extern const struct dma_map_ops *dma_ops;
1010

11-
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
11+
static inline const struct dma_map_ops *get_arch_dma_ops(void)
1212
{
1313
return dma_ops;
1414
}

arch/mips/include/asm/dma-mapping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
extern const struct dma_map_ops jazz_dma_ops;
88

9-
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
9+
static inline const struct dma_map_ops *get_arch_dma_ops(void)
1010
{
1111
#if defined(CONFIG_MACH_JAZZ)
1212
return &jazz_dma_ops;

arch/mips/sgi-ip22/ip22-gio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ static struct attribute *gio_dev_attrs[] = {
199199
};
200200
ATTRIBUTE_GROUPS(gio_dev);
201201

202-
static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env)
202+
static int gio_device_uevent(const struct device *dev, struct kobj_uevent_env *env)
203203
{
204-
struct gio_device *gio_dev = to_gio_device(dev);
204+
const struct gio_device *gio_dev = to_gio_device(dev);
205205

206206
add_uevent_var(env, "MODALIAS=gio:%x", gio_dev->id.id);
207207
return 0;

arch/parisc/include/asm/dma-mapping.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
extern const struct dma_map_ops *hppa_dma_ops;
2323

24-
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
24+
static inline const struct dma_map_ops *get_arch_dma_ops(void)
2525
{
2626
return hppa_dma_ops;
2727
}

arch/parisc/kernel/drivers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ static int parisc_generic_match(struct device *dev, struct device_driver *drv)
552552
return match_device(to_parisc_driver(drv), to_parisc_device(dev));
553553
}
554554

555-
static ssize_t make_modalias(struct device *dev, char *buf)
555+
static ssize_t make_modalias(const struct device *dev, char *buf)
556556
{
557557
const struct parisc_device *padev = to_parisc_device(dev);
558558
const struct parisc_device_id *id = &padev->id;
@@ -562,7 +562,7 @@ static ssize_t make_modalias(struct device *dev, char *buf)
562562
(u32)id->sversion);
563563
}
564564

565-
static int parisc_uevent(struct device *dev, struct kobj_uevent_env *env)
565+
static int parisc_uevent(const struct device *dev, struct kobj_uevent_env *env)
566566
{
567567
const struct parisc_device *padev;
568568
char modalias[40];

arch/powerpc/include/asm/ps3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ static inline struct ps3_system_bus_driver *ps3_drv_to_system_bus_drv(
396396
return container_of(_drv, struct ps3_system_bus_driver, core);
397397
}
398398
static inline struct ps3_system_bus_device *ps3_dev_to_system_bus_dev(
399-
struct device *_dev)
399+
const struct device *_dev)
400400
{
401401
return container_of(_dev, struct ps3_system_bus_device, core);
402402
}

0 commit comments

Comments
 (0)