Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68k-for-v6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- Use the generic muldi3 libgcc function
- Miscellaneous fixes and improvements
* tag 'm68k-for-v6.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: libgcc: Fix lvalue abuse in umul_ppmm()
m68k: vga: Fix I/O defines
zorro: Constify 'struct bin_attribute'
m68k: atari: Use str_on_off() helper in atari_nvram_proc_read()
m68k: Use kernel's generic muldi3 libgcc function
+55
-109
+8
arch/Kconfig
+8
arch/Kconfig
···
1526
1526
linux/compiler-*.h in order to override macro definitions that those
1527
1527
headers generally provide.
1528
1528
1529
+
config HAVE_ARCH_LIBGCC_H
1530
+
bool
1531
+
help
1532
+
An architecture can select this if it provides an
1533
+
asm/libgcc.h header that should be included after
1534
+
linux/libgcc.h in order to override macro definitions that
1535
+
header generally provides.
1536
+
1529
1537
config HAVE_ARCH_PREL32_RELOCATIONS
1530
1538
bool
1531
1539
help
+2
arch/m68k/Kconfig
+2
arch/m68k/Kconfig
···
23
23
select GENERIC_LIB_ASHLDI3
24
24
select GENERIC_LIB_ASHRDI3
25
25
select GENERIC_LIB_LSHRDI3
26
+
select GENERIC_LIB_MULDI3
26
27
select HAS_IOPORT if PCI || ISA || ATARI_ROM_ISA
28
+
select HAVE_ARCH_LIBGCC_H
27
29
select HAVE_ARCH_SECCOMP
28
30
select HAVE_ARCH_SECCOMP_FILTER
29
31
select HAVE_ASM_MODVERSIONS
+4
-2
arch/m68k/atari/nvram.c
+4
-2
arch/m68k/atari/nvram.c
···
16
16
#include <linux/proc_fs.h>
17
17
#include <linux/seq_file.h>
18
18
#include <linux/spinlock.h>
19
+
#include <linux/string_choices.h>
19
20
#include <linux/types.h>
21
+
20
22
#include <asm/atarihw.h>
21
23
#include <asm/atariints.h>
22
24
···
200
198
seq_printf(seq, "0x%02x (undefined)\n", nvram[1]);
201
199
202
200
seq_printf(seq, "SCSI arbitration : %s\n",
203
-
(nvram[16] & 0x80) ? "on" : "off");
201
+
str_on_off(nvram[16] & 0x80));
204
202
seq_puts(seq, "SCSI host ID : ");
205
203
if (nvram[16] & 0x80)
206
204
seq_printf(seq, "%d\n", nvram[16] & 7);
···
238
236
vmode & 16 ? "VGA" : "TV", vmode & 32 ? "PAL" : "NTSC");
239
237
seq_printf(seq,
240
238
" %soverscan, compat. mode %s%s\n",
241
-
vmode & 64 ? "" : "no ", vmode & 128 ? "on" : "off",
239
+
vmode & 64 ? "" : "no ", str_on_off(vmode & 128),
242
240
vmode & 256 ?
243
241
(vmode & 16 ? ", line doubling" : ", half screen") : "");
244
242
}
+27
arch/m68k/include/asm/libgcc.h
+27
arch/m68k/include/asm/libgcc.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0 */
2
+
#ifndef __ASM_M68K_LIBGCC_H
3
+
#define __ASM_M68K_LIBGCC_H
4
+
5
+
#ifndef CONFIG_CPU_HAS_NO_MULDIV64
6
+
/*
7
+
* For those 68K CPUs that support 64bit multiply define umul_ppm()
8
+
* for the common muldi3 libgcc helper function (in lib/muldi3.c).
9
+
* CPUs that don't have it (like the original 68000 and ColdFire)
10
+
* will fallback to using the C-coded version of umul_ppmm().
11
+
*/
12
+
#define umul_ppmm(w1, w0, u, v) \
13
+
do { \
14
+
unsigned long __u = (u), __v = (v); \
15
+
unsigned long __w0, __w1; \
16
+
\
17
+
__asm__ ("mulu%.l %3,%1:%0" \
18
+
: "=d" (__w0), \
19
+
"=d" (__w1) \
20
+
: "%0" (__u), \
21
+
"dmi" (__v)); \
22
+
\
23
+
(w0) = __w0; (w1) = __w1; \
24
+
} while (0)
25
+
#endif /* !CONFIG_CPU_HAS_NO_MULDIV64 */
26
+
27
+
#endif /* __ASM_M68K_LIBGCC_H */
+4
-4
arch/m68k/include/asm/vga.h
+4
-4
arch/m68k/include/asm/vga.h
···
9
9
*/
10
10
#ifndef CONFIG_PCI
11
11
12
-
#include <asm/raw_io.h>
12
+
#include <asm/io.h>
13
13
#include <asm/kmap.h>
14
14
15
15
/*
···
29
29
#define inw_p(port) 0
30
30
#define outb_p(port, val) do { } while (0)
31
31
#define outw(port, val) do { } while (0)
32
-
#define readb raw_inb
33
-
#define writeb raw_outb
34
-
#define writew raw_outw
32
+
#define readb __raw_readb
33
+
#define writeb __raw_writeb
34
+
#define writew __raw_writew
35
35
36
36
#endif /* CONFIG_PCI */
37
37
#endif /* _ASM_M68K_VGA_H */
+1
-1
arch/m68k/lib/Makefile
+1
-1
arch/m68k/lib/Makefile
-97
arch/m68k/lib/muldi3.c
-97
arch/m68k/lib/muldi3.c
···
1
-
/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
2
-
gcc-2.7.2.3/longlong.h which is: */
3
-
/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
4
-
5
-
This file is part of GNU CC.
6
-
7
-
GNU CC is free software; you can redistribute it and/or modify
8
-
it under the terms of the GNU General Public License as published by
9
-
the Free Software Foundation; either version 2, or (at your option)
10
-
any later version.
11
-
12
-
GNU CC is distributed in the hope that it will be useful,
13
-
but WITHOUT ANY WARRANTY; without even the implied warranty of
14
-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
-
GNU General Public License for more details. */
16
-
17
-
#include <linux/compiler.h>
18
-
#include <linux/export.h>
19
-
#include <linux/libgcc.h>
20
-
21
-
#ifdef CONFIG_CPU_HAS_NO_MULDIV64
22
-
23
-
#define SI_TYPE_SIZE 32
24
-
#define __BITS4 (SI_TYPE_SIZE / 4)
25
-
#define __ll_B (1L << (SI_TYPE_SIZE / 2))
26
-
#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
27
-
#define __ll_highpart(t) ((USItype) (t) / __ll_B)
28
-
29
-
#define umul_ppmm(w1, w0, u, v) \
30
-
do { \
31
-
USItype __x0, __x1, __x2, __x3; \
32
-
USItype __ul, __vl, __uh, __vh; \
33
-
\
34
-
__ul = __ll_lowpart (u); \
35
-
__uh = __ll_highpart (u); \
36
-
__vl = __ll_lowpart (v); \
37
-
__vh = __ll_highpart (v); \
38
-
\
39
-
__x0 = (USItype) __ul * __vl; \
40
-
__x1 = (USItype) __ul * __vh; \
41
-
__x2 = (USItype) __uh * __vl; \
42
-
__x3 = (USItype) __uh * __vh; \
43
-
\
44
-
__x1 += __ll_highpart (__x0);/* this can't give carry */ \
45
-
__x1 += __x2; /* but this indeed can */ \
46
-
if (__x1 < __x2) /* did we get it? */ \
47
-
__x3 += __ll_B; /* yes, add it in the proper pos. */ \
48
-
\
49
-
(w1) = __x3 + __ll_highpart (__x1); \
50
-
(w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0); \
51
-
} while (0)
52
-
53
-
#else
54
-
55
-
#define umul_ppmm(w1, w0, u, v) \
56
-
__asm__ ("mulu%.l %3,%1:%0" \
57
-
: "=d" ((USItype)(w0)), \
58
-
"=d" ((USItype)(w1)) \
59
-
: "%0" ((USItype)(u)), \
60
-
"dmi" ((USItype)(v)))
61
-
62
-
#endif
63
-
64
-
#define __umulsidi3(u, v) \
65
-
({DIunion __w; \
66
-
umul_ppmm (__w.s.high, __w.s.low, u, v); \
67
-
__w.ll; })
68
-
69
-
typedef int SItype __mode(SI);
70
-
typedef unsigned int USItype __mode(SI);
71
-
typedef int DItype __mode(DI);
72
-
typedef int word_type __mode(__word__);
73
-
74
-
struct DIstruct {SItype high, low;};
75
-
76
-
typedef union
77
-
{
78
-
struct DIstruct s;
79
-
DItype ll;
80
-
} DIunion;
81
-
82
-
DItype
83
-
__muldi3 (DItype u, DItype v)
84
-
{
85
-
DIunion w;
86
-
DIunion uu, vv;
87
-
88
-
uu.ll = u;
89
-
vv.ll = v;
90
-
91
-
w.ll = __umulsidi3 (uu.s.low, vv.s.low);
92
-
w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
93
-
+ (USItype) uu.s.high * (USItype) vv.s.low);
94
-
95
-
return w.ll;
96
-
}
97
-
EXPORT_SYMBOL(__muldi3);
+5
-5
drivers/zorro/zorro-sysfs.c
+5
-5
drivers/zorro/zorro-sysfs.c
···
81
81
};
82
82
83
83
static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj,
84
-
struct bin_attribute *bin_attr,
84
+
const struct bin_attribute *bin_attr,
85
85
char *buf, loff_t off, size_t count)
86
86
{
87
87
struct zorro_dev *z = to_zorro_dev(kobj_to_dev(kobj));
···
98
98
return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd));
99
99
}
100
100
101
-
static struct bin_attribute zorro_config_attr = {
101
+
static const struct bin_attribute zorro_config_attr = {
102
102
.attr = {
103
103
.name = "config",
104
104
.mode = S_IRUGO,
105
105
},
106
106
.size = sizeof(struct ConfigDev),
107
-
.read = zorro_read_config,
107
+
.read_new = zorro_read_config,
108
108
};
109
109
110
-
static struct bin_attribute *zorro_device_bin_attrs[] = {
110
+
static const struct bin_attribute *const zorro_device_bin_attrs[] = {
111
111
&zorro_config_attr,
112
112
NULL
113
113
};
114
114
115
115
static const struct attribute_group zorro_device_attr_group = {
116
116
.attrs = zorro_device_attrs,
117
-
.bin_attrs = zorro_device_bin_attrs,
117
+
.bin_attrs_new = zorro_device_bin_attrs,
118
118
};
119
119
120
120
const struct attribute_group *zorro_device_attribute_groups[] = {