Skip to content

Commit 91ff6ca

Browse files
mpempe
committed
Automatic merge of 'next' into merge (2024-02-26 17:03)
2 parents ecb2b31 + a3e1820 commit 91ff6ca

File tree

11 files changed

+196
-165
lines changed

11 files changed

+196
-165
lines changed

‎arch/powerpc/configs/ps3_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ CONFIG_PS3_VRAM=m
2424
CONFIG_PS3_LPM=m
2525
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
2626
CONFIG_KEXEC=y
27-
# CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2 is not set
2827
CONFIG_PPC_4K_PAGES=y
2928
CONFIG_SCHED_SMT=y
3029
CONFIG_PM=y

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -545,19 +545,20 @@ enum {
545545
#define CPU_FTRS_DT_CPU_BASE (~0ul)
546546
#endif
547547

548+
/* pseries may disable DBELL with ibm,pi-features */
548549
#ifdef CONFIG_CPU_LITTLE_ENDIAN
549550
#define CPU_FTRS_ALWAYS \
550-
(CPU_FTRS_POSSIBLE & ~CPU_FTR_HVMODE & CPU_FTRS_POWER7 & \
551-
CPU_FTRS_POWER8E & CPU_FTRS_POWER8 & CPU_FTRS_POWER9 & \
552-
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
551+
(CPU_FTRS_POSSIBLE & ~CPU_FTR_HVMODE & ~CPU_FTR_DBELL & \
552+
CPU_FTRS_POWER7 & CPU_FTRS_POWER8E & CPU_FTRS_POWER8 & \
553+
CPU_FTRS_POWER9 & CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
553554
CPU_FTRS_POWER10 & CPU_FTRS_DT_CPU_BASE)
554555
#else
555556
#define CPU_FTRS_ALWAYS \
556557
(CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \
557558
CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \
558559
CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \
559-
~CPU_FTR_HVMODE & CPU_FTRS_POSSIBLE & CPU_FTRS_POWER9 & \
560-
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
560+
~CPU_FTR_HVMODE & ~CPU_FTR_DBELL & CPU_FTRS_POSSIBLE & \
561+
CPU_FTRS_POWER9 & CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
561562
CPU_FTRS_POWER10 & CPU_FTRS_DT_CPU_BASE)
562563
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
563564
#endif

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,13 @@
201201

202202
#ifdef CONFIG_PPC64_ELF_ABI_V2
203203
#define STK_GOT 24
204-
#define __STK_PARAM(i) (32 + ((i)-3)*8)
204+
#define STK_PARAM_AREA 32
205205
#else
206206
#define STK_GOT 40
207-
#define __STK_PARAM(i) (48 + ((i)-3)*8)
207+
#define STK_PARAM_AREA 48
208208
#endif
209+
210+
#define __STK_PARAM(i) (STK_PARAM_AREA + ((i)-3)*8)
209211
#define STK_PARAM(i) __STK_PARAM(__REG_##i)
210212

211213
#ifdef CONFIG_PPC64_ELF_ABI_V2

‎arch/powerpc/kernel/prom.c

+7-3
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ static void __init move_device_tree(void)
151151
* pa-features property is missing, or a 1/0 to indicate if the feature
152152
* is supported/not supported. Note that the bit numbers are
153153
* big-endian to match the definition in PAPR.
154+
* Note: the 'clear' flag clears the feature if the bit is set in the
155+
* ibm,pa/pi-features property, it does not set the feature if the
156+
* bit is clear.
154157
*/
155158
struct ibm_feature {
156159
unsigned long cpu_features; /* CPU_FTR_xxx bit */
@@ -159,7 +162,7 @@ struct ibm_feature {
159162
unsigned int cpu_user_ftrs2; /* PPC_FEATURE2_xxx bit */
160163
unsigned char pabyte; /* byte number in ibm,pa/pi-features */
161164
unsigned char pabit; /* bit number (big-endian) */
162-
unsigned char invert; /* if 1, pa bit set => clear feature */
165+
unsigned char clear; /* if 1, pa bit set => clear feature */
163166
};
164167

165168
static struct ibm_feature ibm_pa_features[] __initdata = {
@@ -193,6 +196,7 @@ static struct ibm_feature ibm_pa_features[] __initdata = {
193196
*/
194197
static struct ibm_feature ibm_pi_features[] __initdata = {
195198
{ .pabyte = 0, .pabit = 3, .mmu_features = MMU_FTR_NX_DSI },
199+
{ .pabyte = 0, .pabit = 4, .cpu_features = CPU_FTR_DBELL, .clear = 1 },
196200
};
197201

198202
static void __init scan_features(unsigned long node, const unsigned char *ftrs,
@@ -220,12 +224,12 @@ static void __init scan_features(unsigned long node, const unsigned char *ftrs,
220224
if (fp->pabyte >= ftrs[0])
221225
continue;
222226
bit = (ftrs[2 + fp->pabyte] >> (7 - fp->pabit)) & 1;
223-
if (bit ^ fp->invert) {
227+
if (bit && !fp->clear) {
224228
cur_cpu_spec->cpu_features |= fp->cpu_features;
225229
cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftrs;
226230
cur_cpu_spec->cpu_user_features2 |= fp->cpu_user_ftrs2;
227231
cur_cpu_spec->mmu_features |= fp->mmu_features;
228-
} else {
232+
} else if (bit == fp->clear) {
229233
cur_cpu_spec->cpu_features &= ~fp->cpu_features;
230234
cur_cpu_spec->cpu_user_features &= ~fp->cpu_user_ftrs;
231235
cur_cpu_spec->cpu_user_features2 &= ~fp->cpu_user_ftrs2;

‎arch/powerpc/platforms/85xx/sgy_cts1000.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static int gpio_halt_probe(struct platform_device *pdev)
114114
return ret;
115115
}
116116

117-
static int gpio_halt_remove(struct platform_device *pdev)
117+
static void gpio_halt_remove(struct platform_device *pdev)
118118
{
119119
free_irq(halt_irq, pdev);
120120
cancel_work_sync(&gpio_halt_wq);
@@ -124,8 +124,6 @@ static int gpio_halt_remove(struct platform_device *pdev)
124124

125125
gpiod_put(halt_gpio);
126126
halt_gpio = NULL;
127-
128-
return 0;
129127
}
130128

131129
static const struct of_device_id gpio_halt_match[] = {
@@ -145,7 +143,7 @@ static struct platform_driver gpio_halt_driver = {
145143
.of_match_table = gpio_halt_match,
146144
},
147145
.probe = gpio_halt_probe,
148-
.remove = gpio_halt_remove,
146+
.remove_new = gpio_halt_remove,
149147
};
150148

151149
module_platform_driver(gpio_halt_driver);

‎arch/powerpc/platforms/pasemi/gpio_mdio.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ static int gpio_mdio_probe(struct platform_device *ofdev)
260260
}
261261

262262

263-
static int gpio_mdio_remove(struct platform_device *dev)
263+
static void gpio_mdio_remove(struct platform_device *dev)
264264
{
265265
struct mii_bus *bus = dev_get_drvdata(&dev->dev);
266266

@@ -271,8 +271,6 @@ static int gpio_mdio_remove(struct platform_device *dev)
271271
kfree(bus->priv);
272272
bus->priv = NULL;
273273
mdiobus_free(bus);
274-
275-
return 0;
276274
}
277275

278276
static const struct of_device_id gpio_mdio_match[] =
@@ -287,7 +285,7 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);
287285
static struct platform_driver gpio_mdio_driver =
288286
{
289287
.probe = gpio_mdio_probe,
290-
.remove = gpio_mdio_remove,
288+
.remove_new = gpio_mdio_remove,
291289
.driver = {
292290
.name = "gpio-mdio-bitbang",
293291
.of_match_table = gpio_mdio_match,

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -425,12 +425,11 @@ static int opal_prd_probe(struct platform_device *pdev)
425425
return 0;
426426
}
427427

428-
static int opal_prd_remove(struct platform_device *pdev)
428+
static void opal_prd_remove(struct platform_device *pdev)
429429
{
430430
misc_deregister(&opal_prd_dev);
431431
opal_message_notifier_unregister(OPAL_MSG_PRD, &opal_prd_event_nb);
432432
opal_message_notifier_unregister(OPAL_MSG_PRD2, &opal_prd_event_nb2);
433-
return 0;
434433
}
435434

436435
static const struct of_device_id opal_prd_match[] = {
@@ -444,7 +443,7 @@ static struct platform_driver opal_prd_driver = {
444443
.of_match_table = opal_prd_match,
445444
},
446445
.probe = opal_prd_probe,
447-
.remove = opal_prd_remove,
446+
.remove_new = opal_prd_remove,
448447
};
449448

450449
module_platform_driver(opal_prd_driver);

0 commit comments

Comments
 (0)