github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Amlogic drivers changes for v6.8:

Browse Source 
- meson-sm: unmap out_base shmem in error path
 - meson-sm: use dev_groups attrs for sysfs entries
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmWBY2sACgkQd9zb2sjI
 SdG03A//ffeK07EHOmm28enMPk108dCG5G/GJ70CmA5ClEaKA28PmcTpsByLKzyP
 Bsm/YaIq7DecUYvuOdZ7CM6AnHgERhzkieeILm2+Aooguzk0JE9V11GqpHLf4udr
 UjLsp2cHBpV4a493B50tE1yIfK08lfyl5LjslNDkt22TIkFFBhWEMDkQyKg4nK9u
 dan7yeLU8kT5G0hj3ZvwLP8yGo0OBiwYemIxE5PvW9io/rbPjszRTXU3uqBtEZno
 qbYzFdaBslYl1x4qumBm7BtPEuSCRKoIgBNcS3avMHTCOND7w/oPTT/kgD9u5Rb3
 NBCZi8/007y9a/r6KMrB5urSpfnWpX8H6j4F+myaPDB8vwmIpJRnlOVGsx++mA2U
 vlFUK6XOmCynXdnLhfvNzIyQ62CgQbMAQxbX90iaH38+87Mbm2zEoPmNvFxpLsw0
 fmD3s1XMeSjyQvXZG2S0UHITUKMWonLapqxwj0A9kWtvStMiHgiLJcPh70603qd3
 222swfkZBkOEIGjzdPRqcHUVOzzZ1JwNPhBKyUAlbIE5Mjs9lq5sz1fj8+cFIrTk
 cXxsLkAo28DQIWa/5ArS+hQGHs0X9KYlWAKPi1d691NjUjq/9B8T5wjlqGs4dFnC
 IDaU19Oth1vb7vaUb012oBx6EDTTA+h77crBIimJoZzQQLcWJ60=
 =3v7y
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWFcTEACgkQYKtH/8kJ
 UieZ8Q//bzfW4YKPRHqoIK4hxmBYMqoxOj3N/ICaC2mNVmos9ExkVTpW+H/Q0b5H
 kHmMewD1pE+p9SZF4UlV9ufPFFLe5S+PoikOlVsNpWO1BpFolu7zhLEuQ/QmqYgs
 h0Hj+12C89GZnWvhpZ1xYqpdBcGtiNO2VlCMxR5RZ0fdyvSit6963pmcEat/CIev
 bT0df0r51JAnQ18qAPwqbTiAwilvUCXjvKHA+UuAQCoEwoCQIuRuoWboFrFclxFB
 p/IjyTlmhfNAfbh/Ic3Zq4/lIVNJCEPi7iCxvyJ0RpTTKQNHlkaiZdX1YCwzMTny
 XzeTBfvlpM/qo4GqFnFPfRVQ3zvZNFomf0bX4bgPVkoX5UXrQ+rJdOZMRQfhMmTt
 FQluMagztuYRSVCVQPI1Rj8d8wnHi3eQu1J/qT2qFwG2NaqsJog1MQwfDfImNWYv
 oN0H8tPtzkNl5dxhdaTqpFBSODpzUx61VvOuPNevzXyMmBthRl2GLwPUpqfg0wl4
 pFUmt2DRNUdrJrfXpja/ZzpMTdECoDn+lTAwX3MH2mWlbDx8+4vp1NVOCGsfIxy1
 eHpuTX098F6rXcGTSXmr90Ht3ijyWSAdk9kpa67eVdutJa/Gqei/RT8RDitlqtd8
 PguY2NPRwodBONFLxStc452NgRSoouEOqPQL23nY294vqQnxZqY=
 =isnC
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-drivers-for-v6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers

Amlogic drivers changes for v6.8:
- meson-sm: unmap out_base shmem in error path
- meson-sm: use dev_groups attrs for sysfs entries

* tag 'amlogic-drivers-for-v6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  firmware: meson-sm: unmap out_base shmem in error path
  firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs

Link: https://lore.kernel.org/r/a987f881-1c23-4528-9cb1-e5a875b7e7a8@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-12-22 11:21:13 +00:00
commit 418188d878
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/firmware/meson/meson_sm.c
View File

@ -274,14 +274,11 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr,
static DEVICE_ATTR_RO(serial);
static struct attribute *meson_sm_sysfs_attributes[] = {
static struct attribute *meson_sm_sysfs_attrs[] = {
&dev_attr_serial.attr,
NULL,
};
static const struct attribute_group meson_sm_sysfs_attr_group = {
.attrs = meson_sm_sysfs_attributes,
};
ATTRIBUTE_GROUPS(meson_sm_sysfs);
static const struct of_device_id meson_sm_ids[] = {
{ .compatible = "amlogic,meson-gxbb-sm", .data = &gxbb_chip },
@ -313,7 +310,7 @@ static int __init meson_sm_probe(struct platform_device *pdev)
fw->sm_shmem_out_base = meson_sm_map_shmem(chip->cmd_shmem_out_base,
chip->shmem_size);
if (WARN_ON(!fw->sm_shmem_out_base))
goto out_in_base;
goto unmap_in_base;
}
fw->chip = chip;
@ -321,16 +318,15 @@ static int __init meson_sm_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, fw);
if (devm_of_platform_populate(dev))
goto out_in_base;
if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group))
goto out_in_base;
goto unmap_out_base;
pr_info("secure-monitor enabled\n");
return 0;
out_in_base:
unmap_out_base:
iounmap(fw->sm_shmem_out_base);
unmap_in_base:
iounmap(fw->sm_shmem_in_base);
out:
return -EINVAL;
@ -340,6 +336,7 @@ static struct platform_driver meson_sm_driver = {
.driver = {
.name = "meson-sm",
.of_match_table = of_match_ptr(meson_sm_ids),
.dev_groups = meson_sm_sysfs_groups,
},
};
module_platform_driver_probe(meson_sm_driver, meson_sm_probe);