Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-fixes-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"Three small fixes for the soc tree:
- devicetee fix for the Arm Juno reference machine, to allow more
interesting PCI configurations
- build fix for SCMI firmware on the NXP i.MX platform
- fix for a race condition in Arm FF-A firmware"
* tag 'soc-fixes-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: fvp: Update PCIe bus-range property
firmware: arm_ffa: Fix the race around setting ffa_dev->properties
firmware: arm_scmi: Fix i.MX build dependency
+23
-18
+1
-1
arch/arm64/boot/dts/arm/fvp-base-revc.dts
+1
-1
arch/arm64/boot/dts/arm/fvp-base-revc.dts
···
233
233
#interrupt-cells = <0x1>;
234
234
compatible = "pci-host-ecam-generic";
235
235
device_type = "pci";
236
-
bus-range = <0x0 0x1>;
236
+
bus-range = <0x0 0xff>;
237
237
reg = <0x0 0x40000000 0x0 0x10000000>;
238
238
ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>;
239
239
interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
+11
-4
drivers/firmware/arm_ffa/bus.c
+11
-4
drivers/firmware/arm_ffa/bus.c
···
187
187
return valid;
188
188
}
189
189
190
-
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
191
-
const struct ffa_ops *ops)
190
+
struct ffa_device *
191
+
ffa_device_register(const struct ffa_partition_info *part_info,
192
+
const struct ffa_ops *ops)
192
193
{
193
194
int id, ret;
195
+
uuid_t uuid;
194
196
struct device *dev;
195
197
struct ffa_device *ffa_dev;
198
+
199
+
if (!part_info)
200
+
return NULL;
196
201
197
202
id = ida_alloc_min(&ffa_bus_id, 1, GFP_KERNEL);
198
203
if (id < 0)
···
215
210
dev_set_name(&ffa_dev->dev, "arm-ffa-%d", id);
216
211
217
212
ffa_dev->id = id;
218
-
ffa_dev->vm_id = vm_id;
213
+
ffa_dev->vm_id = part_info->id;
214
+
ffa_dev->properties = part_info->properties;
219
215
ffa_dev->ops = ops;
220
-
uuid_copy(&ffa_dev->uuid, uuid);
216
+
import_uuid(&uuid, (u8 *)part_info->uuid);
217
+
uuid_copy(&ffa_dev->uuid, &uuid);
221
218
222
219
ret = device_register(&ffa_dev->dev);
223
220
if (ret) {
+1
-6
drivers/firmware/arm_ffa/driver.c
+1
-6
drivers/firmware/arm_ffa/driver.c
···
1387
1387
static int ffa_setup_partitions(void)
1388
1388
{
1389
1389
int count, idx, ret;
1390
-
uuid_t uuid;
1391
1390
struct ffa_device *ffa_dev;
1392
1391
struct ffa_dev_part_info *info;
1393
1392
struct ffa_partition_info *pbuf, *tpbuf;
···
1405
1406
1406
1407
xa_init(&drv_info->partition_info);
1407
1408
for (idx = 0, tpbuf = pbuf; idx < count; idx++, tpbuf++) {
1408
-
import_uuid(&uuid, (u8 *)tpbuf->uuid);
1409
-
1410
1409
/* Note that if the UUID will be uuid_null, that will require
1411
1410
* ffa_bus_notifier() to find the UUID of this partition id
1412
1411
* with help of ffa_device_match_uuid(). FF-A v1.1 and above
1413
1412
* provides UUID here for each partition as part of the
1414
1413
* discovery API and the same is passed.
1415
1414
*/
1416
-
ffa_dev = ffa_device_register(&uuid, tpbuf->id, &ffa_drv_ops);
1415
+
ffa_dev = ffa_device_register(tpbuf, &ffa_drv_ops);
1417
1416
if (!ffa_dev) {
1418
1417
pr_err("%s: failed to register partition ID 0x%x\n",
1419
1418
__func__, tpbuf->id);
1420
1419
continue;
1421
1420
}
1422
-
1423
-
ffa_dev->properties = tpbuf->properties;
1424
1421
1425
1422
if (drv_info->version > FFA_VERSION_1_0 &&
1426
1423
!(tpbuf->properties & FFA_PARTITION_AARCH64_EXEC))
+1
drivers/firmware/arm_scmi/vendors/imx/Kconfig
+1
drivers/firmware/arm_scmi/vendors/imx/Kconfig
-1
drivers/firmware/imx/Kconfig
-1
drivers/firmware/imx/Kconfig
+8
-5
include/linux/arm_ffa.h
+8
-5
include/linux/arm_ffa.h
···
166
166
return dev_get_drvdata(&fdev->dev);
167
167
}
168
168
169
+
struct ffa_partition_info;
170
+
169
171
#if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)
170
-
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
171
-
const struct ffa_ops *ops);
172
+
struct ffa_device *
173
+
ffa_device_register(const struct ffa_partition_info *part_info,
174
+
const struct ffa_ops *ops);
172
175
void ffa_device_unregister(struct ffa_device *ffa_dev);
173
176
int ffa_driver_register(struct ffa_driver *driver, struct module *owner,
174
177
const char *mod_name);
···
179
176
bool ffa_device_is_valid(struct ffa_device *ffa_dev);
180
177
181
178
#else
182
-
static inline
183
-
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
184
-
const struct ffa_ops *ops)
179
+
static inline struct ffa_device *
180
+
ffa_device_register(const struct ffa_partition_info *part_info,
181
+
const struct ffa_ops *ops)
185
182
{
186
183
return NULL;
187
184
}
+1
-1
sound/soc/fsl/Kconfig
+1
-1
sound/soc/fsl/Kconfig
···
29
29
config SND_SOC_FSL_MQS
30
30
tristate "Medium Quality Sound (MQS) module support"
31
31
depends on SND_SOC_FSL_SAI
32
+
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
32
33
select REGMAP_MMIO
33
-
select IMX_SCMI_MISC_DRV if IMX_SCMI_MISC_EXT !=n
34
34
help
35
35
Say Y if you want to add Medium Quality Sound (MQS)
36
36
support for the Freescale CPUs.