diff options
Diffstat (limited to 'mali_kbase/arbiter/mali_kbase_arbif.c')
| -rw-r--r-- | mali_kbase/arbiter/mali_kbase_arbif.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/mali_kbase/arbiter/mali_kbase_arbif.c b/mali_kbase/arbiter/mali_kbase_arbif.c index b5d3cd6..c290dd6 100644 --- a/mali_kbase/arbiter/mali_kbase_arbif.c +++ b/mali_kbase/arbiter/mali_kbase_arbif.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * - * (C) COPYRIGHT 2019-2022 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -32,13 +32,11 @@ /* Arbiter interface version against which was implemented this module */ #define MALI_REQUIRED_KBASE_ARBITER_INTERFACE_VERSION 5 -#if MALI_REQUIRED_KBASE_ARBITER_INTERFACE_VERSION != \ - MALI_ARBITER_INTERFACE_VERSION +#if MALI_REQUIRED_KBASE_ARBITER_INTERFACE_VERSION != MALI_ARBITER_INTERFACE_VERSION #error "Unsupported Mali Arbiter interface version." #endif -static void on_max_config(struct device *dev, uint32_t max_l2_slices, - uint32_t max_core_mask) +static void on_max_config(struct device *dev, uint32_t max_l2_slices, uint32_t max_core_mask) { struct kbase_device *kbdev; @@ -54,9 +52,7 @@ static void on_max_config(struct device *dev, uint32_t max_l2_slices, } if (!max_l2_slices || !max_core_mask) { - dev_dbg(dev, - "%s(): max_config ignored as one of the fields is zero", - __func__); + dev_dbg(dev, "%s(): max_config ignored as one of the fields is zero", __func__); return; } @@ -187,8 +183,9 @@ int kbase_arbif_init(struct kbase_device *kbdev) dev_dbg(kbdev->dev, "%s\n", __func__); - arbiter_if_node = of_parse_phandle(kbdev->dev->of_node, - "arbiter_if", 0); + arbiter_if_node = of_parse_phandle(kbdev->dev->of_node, "arbiter-if", 0); + if (!arbiter_if_node) + arbiter_if_node = of_parse_phandle(kbdev->dev->of_node, "arbiter_if", 0); if (!arbiter_if_node) { dev_dbg(kbdev->dev, "No arbiter_if in Device Tree\n"); /* no arbiter interface defined in device tree */ @@ -230,10 +227,9 @@ int kbase_arbif_init(struct kbase_device *kbdev) /* register kbase arbiter_if callbacks */ if (arb_if->vm_ops.vm_arb_register_dev) { - err = arb_if->vm_ops.vm_arb_register_dev(arb_if, - kbdev->dev, &ops); + err = arb_if->vm_ops.vm_arb_register_dev(arb_if, kbdev->dev, &ops); if (err) { - dev_err(&pdev->dev, "Failed to register with arbiter\n"); + dev_err(&pdev->dev, "Failed to register with arbiter. (err = %d)\n", err); module_put(pdev->dev.driver->owner); put_device(&pdev->dev); if (err != -EPROBE_DEFER) |