Skip to content

Commit 3f1857d

Browse files
author
CKI KWF Bot
committed
Merge: RHEL 10.2: DRM Dependencies Backport (6.17 )
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1596 JIRA: https://issues.redhat.com/browse/RHEL-116876 The DRM backport's goal is to backport all the changes in the DRM subsystem to the kernel target version, with the biggest value being that we get the upstream hardware enablement (and bug fixes) into RHEL. This merge request is the initial step of the DRM backport: identify and backport the dependencies of the DRM backport outside of `drivers/gpu`. Main backport is covered in !1597 This MR depends on 6.16 main and Dependencies backport: Depends: !1448 Depends: !1436 Depends: !1357 Missing fixes which will be brought in another MR: Omitted-fix: 1cf52a0 ("`drm: define NVIDIA DRM format modifiers for GB20x`") Omitted-fix: 664ce10 ("`drm/nouveau: Advertise correct modifiers on GB20x`") Omitted-fix: bf7b4a0 ("`drivers: misc: sram: fix up some const issues with recent attribute changes`") Omitted-fix: f544bf0 ("`mtd: MTD_INTEL_DG should depend on DRM_I915 or DRM_XE`") Omitted-fix: 9591220 ("`MIPS: txx9: Constify bin_attribute arguments of txx9_sram_{read,write}()`") Omitted-fix: e0349c4 ("`scripts/gdb/linux/symbols.py: address changes to module_sect_attrs`") Omitted-fix: e0349c4 ("`scripts/gdb/linux/symbols.py: address changes to module_sect_attrs`") Omitted-fix: 4b65d5a ("`selftests/bpf: Fix bpf selftest build error`") Other: Signed-off-by: Anusha Srivatsa <asrivats@redhat.com> # Merge Request Required Information ## Summary of Changes ## Approved Development Ticket(s) All submissions to CentOS Stream must reference a ticket in [Red Hat Jira](https://issues.redhat.com/). <details><summary>Click for formatting instructions</summary> Please follow the CentOS Stream [contribution documentation](https://docs.centos.org/en-US/stream-contrib/quickstart/) for how to file this ticket and have it approved. List tickets each on their own line of this description using the format "Resolves: RHEL-76229", "Related: RHEL-76229" or "Reverts: RHEL-76229", as appropriate. </details> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Viktor Malik <vmalik@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: José Expósito <jexposit@redhat.com> Approved-by: Petr Oros <poros@redhat.com> Approved-by: Florian Westphal <fwestpha@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 fed22a9 + 60d944d commit 3f1857d

File tree

109 files changed

+1738
-708
lines changed

Some content is hidden

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

109 files changed

+1738
-708
lines changed

‎MAINTAINERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11443,6 +11443,13 @@ L: linux-kernel@vger.kernel.org
1144311443
S: Supported
1144411444
F: arch/x86/include/asm/intel-family.h
1144511445

11446+
INTEL DISCRETE GRAPHICS NVM MTD DRIVER
11447+
M: Alexander Usyskin <alexander.usyskin@intel.com>
11448+
L: linux-mtd@lists.infradead.org
11449+
S: Supported
11450+
F: drivers/mtd/devices/mtd_intel_dg.c
11451+
F: include/linux/intel_dg_nvm_aux.h
11452+
1144611453
INTEL DRM DISPLAY FOR XE AND I915 DRIVERS
1144711454
M: Jani Nikula <jani.nikula@linux.intel.com>
1144811455
M: Rodrigo Vivi <rodrigo.vivi@intel.com>

‎arch/powerpc/kernel/secvar-sysfs.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static ssize_t size_show(struct kobject *kobj, struct kobj_attribute *attr,
5252
}
5353

5454
static ssize_t data_read(struct file *filep, struct kobject *kobj,
55-
struct bin_attribute *attr, char *buf, loff_t off,
55+
const struct bin_attribute *attr, char *buf, loff_t off,
5656
size_t count)
5757
{
5858
char *data;
@@ -85,7 +85,7 @@ static ssize_t data_read(struct file *filep, struct kobject *kobj,
8585
}
8686

8787
static ssize_t update_write(struct file *filep, struct kobject *kobj,
88-
struct bin_attribute *attr, char *buf, loff_t off,
88+
const struct bin_attribute *attr, char *buf, loff_t off,
8989
size_t count)
9090
{
9191
int rc;
@@ -104,11 +104,11 @@ static struct kobj_attribute format_attr = __ATTR_RO(format);
104104

105105
static struct kobj_attribute size_attr = __ATTR_RO(size);
106106

107-
static struct bin_attribute data_attr = __BIN_ATTR_RO(data, 0);
107+
static struct bin_attribute data_attr __ro_after_init = __BIN_ATTR_RO(data, 0);
108108

109-
static struct bin_attribute update_attr = __BIN_ATTR_WO(update, 0);
109+
static struct bin_attribute update_attr __ro_after_init = __BIN_ATTR_WO(update, 0);
110110

111-
static struct bin_attribute *secvar_bin_attrs[] = {
111+
static const struct bin_attribute *const secvar_bin_attrs[] = {
112112
&data_attr,
113113
&update_attr,
114114
NULL,
@@ -121,7 +121,7 @@ static struct attribute *secvar_attrs[] = {
121121

122122
static const struct attribute_group secvar_attr_group = {
123123
.attrs = secvar_attrs,
124-
.bin_attrs = secvar_bin_attrs,
124+
.bin_attrs_new = secvar_bin_attrs,
125125
};
126126
__ATTRIBUTE_GROUPS(secvar_attr);
127127

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ static int create_events_from_catalog(struct attribute ***events_,
998998
}
999999

10001000
static ssize_t catalog_read(struct file *filp, struct kobject *kobj,
1001-
struct bin_attribute *bin_attr, char *buf,
1001+
const struct bin_attribute *bin_attr, char *buf,
10021002
loff_t offset, size_t count)
10031003
{
10041004
long hret;
@@ -1108,14 +1108,14 @@ PAGE_0_ATTR(catalog_version, "%lld\n",
11081108
(unsigned long long)be64_to_cpu(page_0->version));
11091109
PAGE_0_ATTR(catalog_len, "%lld\n",
11101110
(unsigned long long)be32_to_cpu(page_0->length) * 4096);
1111-
static BIN_ATTR_RO(catalog, 0/* real length varies */);
1111+
static const BIN_ATTR_RO(catalog, 0/* real length varies */);
11121112
static DEVICE_ATTR_RO(domains);
11131113
static DEVICE_ATTR_RO(sockets);
11141114
static DEVICE_ATTR_RO(chipspersocket);
11151115
static DEVICE_ATTR_RO(coresperchip);
11161116
static DEVICE_ATTR_RO(cpumask);
11171117

1118-
static struct bin_attribute *if_bin_attrs[] = {
1118+
static const struct bin_attribute *const if_bin_attrs[] = {
11191119
&bin_attr_catalog,
11201120
NULL,
11211121
};
@@ -1141,7 +1141,7 @@ static struct attribute *if_attrs[] = {
11411141

11421142
static const struct attribute_group if_group = {
11431143
.name = "interface",
1144-
.bin_attrs = if_bin_attrs,
1144+
.bin_attrs_new = if_bin_attrs,
11451145
.attrs = if_attrs,
11461146
};
11471147

‎arch/powerpc/platforms/powernv/opal-core.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static Elf64_Word *__init auxv_to_elf64_notes(Elf64_Word *buf,
159159
* Returns number of bytes read on success, -errno on failure.
160160
*/
161161
static ssize_t read_opalcore(struct file *file, struct kobject *kobj,
162-
struct bin_attribute *bin_attr, char *to,
162+
const struct bin_attribute *bin_attr, char *to,
163163
loff_t pos, size_t count)
164164
{
165165
struct opalcore *m;
@@ -206,9 +206,9 @@ static ssize_t read_opalcore(struct file *file, struct kobject *kobj,
206206
return (tpos - pos);
207207
}
208208

209-
static struct bin_attribute opal_core_attr = {
209+
static struct bin_attribute opal_core_attr __ro_after_init = {
210210
.attr = {.name = "core", .mode = 0400},
211-
.read = read_opalcore
211+
.read_new = read_opalcore
212212
};
213213

214214
/*
@@ -599,15 +599,15 @@ static struct attribute *mpipl_attr[] = {
599599
NULL,
600600
};
601601

602-
static struct bin_attribute *mpipl_bin_attr[] = {
602+
static const struct bin_attribute *const mpipl_bin_attr[] = {
603603
&opal_core_attr,
604604
NULL,
605605

606606
};
607607

608608
static const struct attribute_group mpipl_group = {
609609
.attrs = mpipl_attr,
610-
.bin_attrs = mpipl_bin_attr,
610+
.bin_attrs_new = mpipl_bin_attr,
611611
};
612612

613613
static int __init opalcore_init(void)

‎arch/powerpc/platforms/powernv/opal-dump.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static int64_t dump_read_data(struct dump_obj *dump)
286286
}
287287

288288
static ssize_t dump_attr_read(struct file *filep, struct kobject *kobj,
289-
struct bin_attribute *bin_attr,
289+
const struct bin_attribute *bin_attr,
290290
char *buffer, loff_t pos, size_t count)
291291
{
292292
ssize_t rc;
@@ -342,7 +342,7 @@ static void create_dump_obj(uint32_t id, size_t size, uint32_t type)
342342
dump->dump_attr.attr.name = "dump";
343343
dump->dump_attr.attr.mode = 0400;
344344
dump->dump_attr.size = size;
345-
dump->dump_attr.read = dump_attr_read;
345+
dump->dump_attr.read_new = dump_attr_read;
346346

347347
dump->id = id;
348348
dump->size = size;

‎arch/powerpc/platforms/powernv/opal-elog.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static const struct kobj_type elog_ktype = {
156156
#define OPAL_MAX_ERRLOG_SIZE 16384
157157

158158
static ssize_t raw_attr_read(struct file *filep, struct kobject *kobj,
159-
struct bin_attribute *bin_attr,
159+
const struct bin_attribute *bin_attr,
160160
char *buffer, loff_t pos, size_t count)
161161
{
162162
int opal_rc;
@@ -203,7 +203,7 @@ static void create_elog_obj(uint64_t id, size_t size, uint64_t type)
203203
elog->raw_attr.attr.name = "raw";
204204
elog->raw_attr.attr.mode = 0400;
205205
elog->raw_attr.size = size;
206-
elog->raw_attr.read = raw_attr_read;
206+
elog->raw_attr.read_new = raw_attr_read;
207207

208208
elog->id = id;
209209
elog->size = size;

‎arch/powerpc/platforms/powernv/opal-flash.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static int alloc_image_buf(char *buffer, size_t count)
432432
* and pre-allocate required memory.
433433
*/
434434
static ssize_t image_data_write(struct file *filp, struct kobject *kobj,
435-
struct bin_attribute *bin_attr,
435+
const struct bin_attribute *bin_attr,
436436
char *buffer, loff_t pos, size_t count)
437437
{
438438
int rc;
@@ -493,7 +493,7 @@ static ssize_t image_data_write(struct file *filp, struct kobject *kobj,
493493
static const struct bin_attribute image_data_attr = {
494494
.attr = {.name = "image", .mode = 0200},
495495
.size = MAX_IMAGE_SIZE, /* Limit image size */
496-
.write = image_data_write,
496+
.write_new = image_data_write,
497497
};
498498

499499
static struct kobj_attribute validate_attribute =

‎arch/powerpc/platforms/powernv/opal-msglog.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count)
9494
}
9595

9696
static ssize_t opal_msglog_read(struct file *file, struct kobject *kobj,
97-
struct bin_attribute *bin_attr, char *to,
97+
const struct bin_attribute *bin_attr, char *to,
9898
loff_t pos, size_t count)
9999
{
100100
return opal_msglog_copy(to, pos, count);
101101
}
102102

103-
static struct bin_attribute opal_msglog_attr = {
103+
static struct bin_attribute opal_msglog_attr __ro_after_init = {
104104
.attr = {.name = "msglog", .mode = 0400},
105-
.read = opal_msglog_read
105+
.read_new = opal_msglog_read
106106
};
107107

108108
struct memcons *__init memcons_init(struct device_node *node, const char *mc_prop_name)

‎arch/powerpc/platforms/powernv/ultravisor.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ int __init early_init_dt_scan_ultravisor(unsigned long node, const char *uname,
3232
static struct memcons *uv_memcons;
3333

3434
static ssize_t uv_msglog_read(struct file *file, struct kobject *kobj,
35-
struct bin_attribute *bin_attr, char *to,
35+
const struct bin_attribute *bin_attr, char *to,
3636
loff_t pos, size_t count)
3737
{
3838
return memcons_copy(uv_memcons, to, pos, count);
3939
}
4040

41-
static struct bin_attribute uv_msglog_attr = {
41+
static struct bin_attribute uv_msglog_attr __ro_after_init = {
4242
.attr = {.name = "msglog", .mode = 0400},
43-
.read = uv_msglog_read
43+
.read_new = uv_msglog_read
4444
};
4545

4646
static int __init uv_init(void)

‎arch/s390/kernel/cpacf.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define CPACF_QUERY(name, instruction) \
1515
static ssize_t name##_query_raw_read(struct file *fp, \
1616
struct kobject *kobj, \
17-
struct bin_attribute *attr, \
17+
const struct bin_attribute *attr, \
1818
char *buf, loff_t offs, \
1919
size_t count) \
2020
{ \
@@ -24,7 +24,7 @@ static ssize_t name##_query_raw_read(struct file *fp, \
2424
return -EOPNOTSUPP; \
2525
return memory_read_from_buffer(buf, count, &offs, &mask, sizeof(mask)); \
2626
} \
27-
static BIN_ATTR_RO(name##_query_raw, sizeof(cpacf_mask_t))
27+
static const BIN_ATTR_RO(name##_query_raw, sizeof(cpacf_mask_t))
2828

2929
CPACF_QUERY(km, KM);
3030
CPACF_QUERY(kmc, KMC);
@@ -40,20 +40,20 @@ CPACF_QUERY(prno, PRNO);
4040
CPACF_QUERY(kma, KMA);
4141
CPACF_QUERY(kdsa, KDSA);
4242

43-
#define CPACF_QAI(name, instruction) \
44-
static ssize_t name##_query_auth_info_raw_read( \
45-
struct file *fp, struct kobject *kobj, \
46-
struct bin_attribute *attr, char *buf, loff_t offs, \
47-
size_t count) \
48-
{ \
49-
cpacf_qai_t qai; \
50-
\
51-
if (!cpacf_qai(CPACF_##instruction, &qai)) \
52-
return -EOPNOTSUPP; \
53-
return memory_read_from_buffer(buf, count, &offs, &qai, \
54-
sizeof(qai)); \
55-
} \
56-
static BIN_ATTR_RO(name##_query_auth_info_raw, sizeof(cpacf_qai_t))
43+
#define CPACF_QAI(name, instruction) \
44+
static ssize_t name##_query_auth_info_raw_read( \
45+
struct file *fp, struct kobject *kobj, \
46+
const struct bin_attribute *attr, char *buf, loff_t offs, \
47+
size_t count) \
48+
{ \
49+
cpacf_qai_t qai; \
50+
\
51+
if (!cpacf_qai(CPACF_##instruction, &qai)) \
52+
return -EOPNOTSUPP; \
53+
return memory_read_from_buffer(buf, count, &offs, &qai, \
54+
sizeof(qai)); \
55+
} \
56+
static const BIN_ATTR_RO(name##_query_auth_info_raw, sizeof(cpacf_qai_t))
5757

5858
CPACF_QAI(km, KM);
5959
CPACF_QAI(kmc, KMC);
@@ -69,7 +69,7 @@ CPACF_QAI(prno, PRNO);
6969
CPACF_QAI(kma, KMA);
7070
CPACF_QAI(kdsa, KDSA);
7171

72-
static struct bin_attribute *cpacf_attrs[] = {
72+
static const struct bin_attribute *const cpacf_attrs[] = {
7373
&bin_attr_km_query_raw,
7474
&bin_attr_kmc_query_raw,
7575
&bin_attr_kimd_query_raw,
@@ -101,7 +101,7 @@ static struct bin_attribute *cpacf_attrs[] = {
101101

102102
static const struct attribute_group cpacf_attr_grp = {
103103
.name = "cpacf",
104-
.bin_attrs = cpacf_attrs,
104+
.bin_attrs_new = cpacf_attrs,
105105
};
106106

107107
static int __init cpacf_init(void)

0 commit comments

Comments
 (0)