dri-devel March 2021

dri-devel@lists.freedesktop.org

326 participants
867 discussions

[PATCH] drm/bridge: sii9234: sil-sii8620.c: move to use request_irq by IRQF_NO_AUTOEN flag
by Tian Tao 15 Mar '21

15 Mar '21

After this patch cbe16f35bee68 genirq: Add IRQF_NO_AUTOEN for request_irq/nmi() is merged. request_irq() after setting IRQ_NOAUTOEN as below irq_set_status_flags(irq, IRQ_NOAUTOEN); request_irq(dev, irq...); can be replaced by request_irq() with IRQF_NO_AUTOEN flag. Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> --- drivers/gpu/drm/bridge/sii9234.c | 4 ++-- drivers/gpu/drm/bridge/sil-sii8620.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c index 15c98a7..2742d5d 100644 --- a/drivers/gpu/drm/bridge/sii9234.c +++ b/drivers/gpu/drm/bridge/sii9234.c @@ -911,10 +911,10 @@ static int sii9234_probe(struct i2c_client *client, return -EINVAL; } - irq_set_status_flags(client->irq, IRQ_NOAUTOEN); ret = devm_request_threaded_irq(dev, client->irq, NULL, sii9234_irq_thread, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT | + IRQ_NOAUTOEN, "sii9234", ctx); if (ret < 0) { dev_err(dev, "failed to install IRQ handler\n"); diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 843265d..9476ef0 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -2308,10 +2308,10 @@ static int sii8620_probe(struct i2c_client *client, dev_err(dev, "no irq provided\n"); return -EINVAL; } - irq_set_status_flags(client->irq, IRQ_NOAUTOEN); ret = devm_request_threaded_irq(dev, client->irq, NULL, sii8620_irq_thread, - IRQF_TRIGGER_HIGH | IRQF_ONESHOT, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT | + IRQ_NOAUTOEN, "sii8620", ctx); if (ret < 0) return dev_err_probe(dev, ret, -- 2.7.4

1 0

[PATCH] drm/exynos/decon5433: Clean up GPIO includes
by Tian Tao 15 Mar '21

15 Mar '21

remove the legacy GPIO headers <linux/of_gpio.h> but what it really uses is <linux/gpio/consumer.h> since only gpio_desc structs are ever referenced. Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 1f79bc2..9fc51a6 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -11,9 +11,9 @@ #include <linux/component.h> #include <linux/iopoll.h> #include <linux/irq.h> +#include <linux/gpio/consumer.h> #include <linux/mfd/syscon.h> #include <linux/of_device.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> -- 2.7.4

3 4

[PATCH] drm/exynos/decon5433: Remove the unused include statements
by Tian Tao 15 Mar '21

15 Mar '21

This driver doesn't reference of_gpio.h, so drop it. Signed-off-by: Tian Tao <tiantao6(a)hisilicon.com> --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 1f79bc2..1510e4e 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -13,7 +13,6 @@ #include <linux/irq.h> #include <linux/mfd/syscon.h> #include <linux/of_device.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> -- 2.7.4

1 0

[RFC v3 0/3] Introduce Virtio based Dmabuf driver
by Vivek Kasireddy 15 Mar '21

15 Mar '21

The Virtual Dmabuf or Virtio based Dmabuf (Vdmabuf) driver can be used to "transfer" a page-backed dmabuf created in the Guest to the Host without making any copies. This is mostly accomplished by recreating the dmabuf on the Host using the PFNs and other meta-data shared by the guest. A use-case where this driver would be a good fit is a multi-GPU system (perhaps one discrete and one integrated) where one of the GPUs does not have access to the display/connectors/outputs. This could be an embedded system design decision or a restriction made at the firmware/BIOS level or perhaps the device is setup in UPT (Universal Passthrough) mode. When such a GPU is passthrough'd to a Guest OS, this driver can help in transferring the scanout buffer(s) (rendered using the native rendering stack) to the Host for the purpose of displaying them. Or, quite simply, this driver can be used to transfer a dmabuf created by an application running on the Guest to another application running on the Host. The userspace component running in the Guest that transfers the dmabuf is referred to as the producer or exporter and its counterpart running in the Host is referred to as importer or consumer. For instance, a Wayland compositor would potentially be a producer and Qemu UI would be a consumer. It is the producer's responsibility to not reuse or destroy the shared buffer while it is still being used by the consumer. The consumer would send a release cmd indicating that it is done after which the shared buffer can be safely used again by the producer. One way the producer can prevent accidental re-use of the shared buffer is to lock the buffer when it exports it and unlock it after it gets a release cmd. As an example, the GBM API provides a simple way to lock and unlock a surface's buffers. For each dmabuf that is to be shared with the Host, a 128-bit unique ID is generated that identifies this buffer across the whole system. This ID is a combination of the Qemu process ID, a counter and a randomizer. We could potentially use UUID API but we currently use the above mentioned combination to identify the source of the buffer at any given time for potential bookkeeping. A typical cycle starts with the producer or exporter calling the export IOCTL to export a dmabuf; a new unique ID is generated for this buffer and it gets registered with the Host. The Host then alerts the consumer or importer by raising an event and shares the ID. In response, the consumer calls the import IOCTL using the ID and gets a newly created dmabuf fd in return. After it is done using the dmabuf, the consumer finally calls the release IOCTL and the Guest is notified which in turn notifies the producer letting it know that the buffer is now safe to reuse. v2: - Added a notifier mechanism for getting the kvm pointer. - Added start and stop routines in the Vhost backend. - Augmented the cover letter and made some minor improvements. v3: - Refactored the code to make it similar to vsock Vivek Kasireddy (3): kvm: Add a notifier for create and destroy VM events virtio: Introduce Vdmabuf driver vhost: Add Vdmabuf backend drivers/vhost/Kconfig | 9 + drivers/vhost/Makefile | 3 + drivers/vhost/vdmabuf.c | 1446 +++++++++++++++++++++++++++ drivers/virtio/Kconfig | 8 + drivers/virtio/Makefile | 1 + drivers/virtio/virtio_vdmabuf.c | 1090 ++++++++++++++++++++ include/linux/kvm_host.h | 5 + include/linux/virtio_vdmabuf.h | 271 +++++ include/uapi/linux/vhost.h | 3 + include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_vdmabuf.h | 99 ++ virt/kvm/kvm_main.c | 20 +- 12 files changed, 2954 insertions(+), 2 deletions(-) create mode 100644 drivers/vhost/vdmabuf.c create mode 100644 drivers/virtio/virtio_vdmabuf.c create mode 100644 include/linux/virtio_vdmabuf.h create mode 100644 include/uapi/linux/virtio_vdmabuf.h -- 2.26.2

6 18

[PATCH] gpu: drm: amd: pm: Mundane typo fix in the file amdgpu_pm.c
by Bhaskar Chowdhury 15 Mar '21

15 Mar '21

s/maxmum/maximum/ Signed-off-by: Bhaskar Chowdhury <unixbhaskar(a)gmail.com> --- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c index 7b6ef05a1d35..7af74d236600 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c @@ -3143,7 +3143,7 @@ static ssize_t amdgpu_hwmon_show_mclk_label(struct device *dev, * * - fan1_min: an minimum value Unit: revolution/min (RPM) * - * - fan1_max: an maxmum value Unit: revolution/max (RPM) + * - fan1_max: an maximum value Unit: revolution/max (RPM) * * - fan1_input: fan speed in RPM * -- 2.30.2

2 1

[PATCH v1] drm/tegra: Use dev_err_probe()
by Dmitry Osipenko 14 Mar '21

14 Mar '21

Use generic dev_err_probe() helper which silences noisy error messages about deferred probe of the Tegra DRM drivers. Signed-off-by: Dmitry Osipenko <digetx(a)gmail.com> --- drivers/gpu/drm/tegra/dc.c | 13 +++---------- drivers/gpu/drm/tegra/hdmi.c | 34 +++++++++------------------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 0ae3a025efe9..ff7968200d4e 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -2589,16 +2589,9 @@ static int tegra_dc_probe(struct platform_device *pdev) return -ENXIO; err = tegra_dc_rgb_probe(dc); - if (err < 0 && err != -ENODEV) { - const char *level = KERN_ERR; - - if (err == -EPROBE_DEFER) - level = KERN_DEBUG; - - dev_printk(level, dc->dev, "failed to probe RGB output: %d\n", - err); - return err; - } + if (err < 0 && err != -ENODEV) + return dev_err_probe(&pdev->dev, err, + "failed to probe RGB output\n"); platform_set_drvdata(pdev, dc); pm_runtime_enable(&pdev->dev); diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index e5d2a4026028..f5abb73d20ad 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1635,7 +1635,6 @@ static irqreturn_t tegra_hdmi_irq(int irq, void *data) static int tegra_hdmi_probe(struct platform_device *pdev) { - const char *level = KERN_ERR; struct tegra_hdmi *hdmi; struct resource *regs; int err; @@ -1675,36 +1674,21 @@ static int tegra_hdmi_probe(struct platform_device *pdev) hdmi->hdmi = devm_regulator_get(&pdev->dev, "hdmi"); err = PTR_ERR_OR_ZERO(hdmi->hdmi); - if (err) { - if (err == -EPROBE_DEFER) - level = KERN_DEBUG; - - dev_printk(level, &pdev->dev, - "failed to get HDMI regulator: %d\n", err); - return err; - } + if (err) + return dev_err_probe(&pdev->dev, err, + "failed to get HDMI regulator\n"); hdmi->pll = devm_regulator_get(&pdev->dev, "pll"); err = PTR_ERR_OR_ZERO(hdmi->pll); - if (err) { - if (err == -EPROBE_DEFER) - level = KERN_DEBUG; - - dev_printk(level, &pdev->dev, - "failed to get PLL regulator: %d\n", err); - return err; - } + if (err) + return dev_err_probe(&pdev->dev, err, + "failed to get PLL regulator\n"); hdmi->vdd = devm_regulator_get(&pdev->dev, "vdd"); err = PTR_ERR_OR_ZERO(hdmi->vdd); - if (err) { - if (err == -EPROBE_DEFER) - level = KERN_DEBUG; - - dev_printk(level, &pdev->dev, - "failed to get VDD regulator: %d\n", err); - return err; - } + if (err) + return dev_err_probe(&pdev->dev, err, + "failed to get VDD regulator\n"); hdmi->output.dev = &pdev->dev; -- 2.30.2

1 0

[iomem] e14497b88f: BUG:KASAN:null-ptr-deref_in_alloc_anon_inode
by kernel test robot 14 Mar '21

14 Mar '21

Greeting, FYI, we noticed the following commit (built with clang-13): commit: e14497b88f9919aeedd47efb2762dfa5fc6b640e ("[PATCH 7/9] iomem: remove the iomem file system") url: https://github.com/0day-ci/linux/commits/Christoph-Hellwig/fs-rename-alloc_… base: https://git.kernel.org/cgit/linux/kernel/git/gregkh/char-misc.git 080951f99de1e483a9a48f34c079b634f2912a54 in testcase: boot on test machine: qemu-system-x86_64 -enable-kvm -cpu SandyBridge -smp 2 -m 8G caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace): +----------------------------------------------+------------+------------+ | | 0befbcb842 | e14497b88f | +----------------------------------------------+------------+------------+ | BUG:KASAN:null-ptr-deref_in_alloc_anon_inode | 0 | 12 | | RIP:alloc_anon_inode | 0 | 12 | +----------------------------------------------+------------+------------+ If you fix the issue, kindly add following tag Reported-by: kernel test robot <oliver.sang(a)intel.com> [ 3.359173] BUG: KASAN: null-ptr-deref in alloc_anon_inode (kbuild/src/consumer/fs/anon_inodes.c:235) [ 3.359395] Read of size 8 at addr 0000000000000008 by task swapper/0/1 [ 3.359395] [ 3.359395] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.12.0-rc2-00012-ge14497b88f99 #2 [ 3.359395] Call Trace: [ 3.359395] dump_stack (kbuild/src/consumer/include/linux/instrumented.h:86 kbuild/src/consumer/include/asm-generic/atomic-instrumented.h:45 kbuild/src/consumer/lib/dump_stack.c:123) [ 3.359395] kasan_report (kbuild/src/consumer/mm/kasan/report.c:403 kbuild/src/consumer/mm/kasan/report.c:416) [ 3.359395] ? amd_cache_northbridges (kbuild/src/consumer/arch/x86/kernel/amd_nb.c:240) [ 3.359395] ? alloc_anon_inode (kbuild/src/consumer/fs/anon_inodes.c:235) [ 3.359395] ? reserve_setup (kbuild/src/consumer/kernel/resource.c:1843) [ 3.359395] __asan_load8 (kbuild/src/consumer/mm/kasan/generic.c:253) [ 3.359395] alloc_anon_inode (kbuild/src/consumer/fs/anon_inodes.c:235) [ 3.359395] iomem_init_inode (kbuild/src/consumer/kernel/resource.c:1846) [ 3.359395] do_one_initcall (kbuild/src/consumer/init/main.c:1226) [ 3.359395] ? next_arg (kbuild/src/consumer/lib/cmdline.c:257) [ 3.359395] ? parse_args (kbuild/src/consumer/kernel/params.c:179) [ 3.359395] do_initcall_level (kbuild/src/consumer/init/main.c:1298) [ 3.359395] do_initcalls (kbuild/src/consumer/init/main.c:1312) [ 3.359395] do_basic_setup (kbuild/src/consumer/init/main.c:1336) [ 3.359395] kernel_init_freeable (kbuild/src/consumer/init/main.c:1541) [ 3.359395] ? rest_init (kbuild/src/consumer/init/main.c:1421) [ 3.359395] kernel_init (kbuild/src/consumer/init/main.c:1426) [ 3.359395] ? rest_init (kbuild/src/consumer/init/main.c:1421) [ 3.359395] ret_from_fork (kbuild/src/consumer/arch/x86/entry/entry_64.S:300) [ 3.359395] ================================================================== [ 3.359395] Disabling lock debugging due to kernel taint [ 3.359437] BUG: kernel NULL pointer dereference, address: 0000000000000008 [ 3.360918] #PF: supervisor read access in kernel mode [ 3.361918] #PF: error_code(0x0000) - not-present page [ 3.362728] PGD 0 P4D 0 [ 3.362728] Oops: 0000 [#1] SMP KASAN [ 3.362728] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G B 5.12.0-rc2-00012-ge14497b88f99 #2 [ 3.362728] RIP: 0010:alloc_anon_inode (kbuild/src/consumer/fs/anon_inodes.c:235) [ 3.362728] Code: 71 fe ff ff 5d c3 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 55 48 89 e5 53 48 8b 1d 54 45 cc 02 48 8d 7b 08 e8 4b 8e f4 ff <48> 8b 7b 08 e8 c2 a5 fc ff 5b 5d c3 66 66 2e 0f 1f 84 00 00 00 00 All code ======== 0: 71 fe jno 0x0 2: ff (bad) 3: ff 5d c3 lcall *-0x3d(%rbp) 6: 66 66 2e 0f 1f 84 00 data16 nopw %cs:0x0(%rax,%rax,1) d: 00 00 00 00 11: 0f 1f 40 00 nopl 0x0(%rax) 15: 55 push %rbp 16: 48 89 e5 mov %rsp,%rbp 19: 53 push %rbx 1a: 48 8b 1d 54 45 cc 02 mov 0x2cc4554(%rip),%rbx # 0x2cc4575 21: 48 8d 7b 08 lea 0x8(%rbx),%rdi 25: e8 4b 8e f4 ff callq 0xfffffffffff48e75 2a:* 48 8b 7b 08 mov 0x8(%rbx),%rdi <-- trapping instruction 2e: e8 c2 a5 fc ff callq 0xfffffffffffca5f5 33: 5b pop %rbx 34: 5d pop %rbp 35: c3 retq 36: 66 data16 37: 66 data16 38: 2e cs 39: 0f .byte 0xf 3a: 1f (bad) 3b: 84 00 test %al,(%rax) 3d: 00 00 add %al,(%rax) ... Code starting with the faulting instruction =========================================== 0: 48 8b 7b 08 mov 0x8(%rbx),%rdi 4: e8 c2 a5 fc ff callq 0xfffffffffffca5cb 9: 5b pop %rbx a: 5d pop %rbp b: c3 retq c: 66 data16 d: 66 data16 e: 2e cs f: 0f .byte 0xf 10: 1f (bad) 11: 84 00 test %al,(%rax) 13: 00 00 add %al,(%rax) ... [ 3.362728] RSP: 0000:ffff8881001afd10 EFLAGS: 00010282 [ 3.362728] RAX: ffff8881001a0001 RBX: 0000000000000000 RCX: ffffffff811b7d0f [ 3.362728] RDX: dffffc0000000000 RSI: 0000000000000000 RDI: ffffffff83c11c58 [ 3.362728] RBP: ffff8881001afd18 R08: dffffc0000000000 R09: fffffbfff078238c [ 3.362728] R10: fffffbfff078238c R11: 0000000000000000 R12: 0000000000000000 [ 3.362728] R13: 0000000000000000 R14: ffffffff8435b9c0 R15: ffffffff8361c400 [ 3.362728] FS: 0000000000000000(0000) GS:ffff8881e8600000(0000) knlGS:0000000000000000 [ 3.362728] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3.362728] CR2: 0000000000000008 CR3: 0000000003616000 CR4: 00000000000006b0 [ 3.362728] Call Trace: [ 3.362728] iomem_init_inode (kbuild/src/consumer/kernel/resource.c:1846) [ 3.362728] do_one_initcall (kbuild/src/consumer/init/main.c:1226) [ 3.362728] ? next_arg (kbuild/src/consumer/lib/cmdline.c:257) [ 3.362728] ? parse_args (kbuild/src/consumer/kernel/params.c:179) [ 3.362728] do_initcall_level (kbuild/src/consumer/init/main.c:1298) [ 3.362728] do_initcalls (kbuild/src/consumer/init/main.c:1312) [ 3.362728] do_basic_setup (kbuild/src/consumer/init/main.c:1336) [ 3.362728] kernel_init_freeable (kbuild/src/consumer/init/main.c:1541) [ 3.362728] ? rest_init (kbuild/src/consumer/init/main.c:1421) [ 3.362728] kernel_init (kbuild/src/consumer/init/main.c:1426) [ 3.362728] ? rest_init (kbuild/src/consumer/init/main.c:1421) [ 3.362728] ret_from_fork (kbuild/src/consumer/arch/x86/entry/entry_64.S:300) [ 3.362728] Modules linked in: [ 3.362728] CR2: 0000000000000008 [ 3.362728] ---[ end trace e17c94a42475f8e5 ]--- [ 3.362728] RIP: 0010:alloc_anon_inode (kbuild/src/consumer/fs/anon_inodes.c:235) [ 3.362728] Code: 71 fe ff ff 5d c3 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 55 48 89 e5 53 48 8b 1d 54 45 cc 02 48 8d 7b 08 e8 4b 8e f4 ff <48> 8b 7b 08 e8 c2 a5 fc ff 5b 5d c3 66 66 2e 0f 1f 84 00 00 00 00 All code ======== 0: 71 fe jno 0x0 2: ff (bad) 3: ff 5d c3 lcall *-0x3d(%rbp) 6: 66 66 2e 0f 1f 84 00 data16 nopw %cs:0x0(%rax,%rax,1) d: 00 00 00 00 11: 0f 1f 40 00 nopl 0x0(%rax) 15: 55 push %rbp 16: 48 89 e5 mov %rsp,%rbp 19: 53 push %rbx 1a: 48 8b 1d 54 45 cc 02 mov 0x2cc4554(%rip),%rbx # 0x2cc4575 21: 48 8d 7b 08 lea 0x8(%rbx),%rdi 25: e8 4b 8e f4 ff callq 0xfffffffffff48e75 2a:* 48 8b 7b 08 mov 0x8(%rbx),%rdi <-- trapping instruction 2e: e8 c2 a5 fc ff callq 0xfffffffffffca5f5 33: 5b pop %rbx 34: 5d pop %rbp 35: c3 retq 36: 66 data16 37: 66 data16 38: 2e cs 39: 0f .byte 0xf 3a: 1f (bad) 3b: 84 00 test %al,(%rax) 3d: 00 00 add %al,(%rax) ... Code starting with the faulting instruction =========================================== 0: 48 8b 7b 08 mov 0x8(%rbx),%rdi 4: e8 c2 a5 fc ff callq 0xfffffffffffca5cb 9: 5b pop %rbx a: 5d pop %rbp b: c3 retq c: 66 data16 d: 66 data16 e: 2e cs f: 0f .byte 0xf 10: 1f (bad) 11: 84 00 test %al,(%rax) 13: 00 00 add %al,(%rax) To reproduce: # build kernel cd linux cp config-5.12.0-rc2-00012-ge14497b88f99 .config make HOSTCC=clang-13 CC=clang-13 ARCH=x86_64 olddefconfig prepare modules_prepare bzImage git clone https://github.com/intel/lkp-tests.git cd lkp-tests bin/lkp qemu -k <bzImage> job-script # job-script is attached in this email --- 0DAY/LKP+ Test Infrastructure Open Source Technology Center https://lists.01.org/hyperkitty/list/lkp@lists.01.org Intel Corporation Thanks, Oliver Sang

1 0

Re: [PATCH 15/17] iommu: remove DOMAIN_ATTR_NESTING
by Auger Eric 14 Mar '21

14 Mar '21

Hi Christoph, On 3/1/21 9:42 AM, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch(a)lst.de> > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 40 ++++++--------------- > drivers/iommu/arm/arm-smmu/arm-smmu.c | 30 ++++++++++------ > drivers/iommu/intel/iommu.c | 28 +++++---------- > drivers/iommu/iommu.c | 8 +++++ > drivers/vfio/vfio_iommu_type1.c | 5 +-- > include/linux/iommu.h | 4 ++- > 6 files changed, 50 insertions(+), 65 deletions(-) As mentionned by Robin, there are series planning to use DOMAIN_ATTR_NESTING to get info about the nested caps of the iommu (ARM and Intel): [Patch v8 00/10] vfio: expose virtual Shared Virtual Addressing to VMs patches 1, 2, 3 Is the plan to introduce a new domain_get_nesting_info ops then? Thanks Eric > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index bf96172e8c1f71..8e6fee3ea454d3 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -2466,41 +2466,21 @@ static void arm_smmu_dma_enable_flush_queue(struct iommu_domain *domain) > to_smmu_domain(domain)->non_strict = true; > } > > -static int arm_smmu_domain_set_attr(struct iommu_domain *domain, > - enum iommu_attr attr, void *data) > +static int arm_smmu_domain_enable_nesting(struct iommu_domain *domain) > { > - int ret = 0; > struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > + int ret = -EPERM; > > - mutex_lock(&smmu_domain->init_mutex); > + if (domain->type != IOMMU_DOMAIN_UNMANAGED) > + return -EINVAL; > > - switch (domain->type) { > - case IOMMU_DOMAIN_UNMANAGED: > - switch (attr) { > - case DOMAIN_ATTR_NESTING: > - if (smmu_domain->smmu) { > - ret = -EPERM; > - goto out_unlock; > - } > - > - if (*(int *)data) > - smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > - else > - smmu_domain->stage = ARM_SMMU_DOMAIN_S1; > - break; > - default: > - ret = -ENODEV; > - } > - break; > - case IOMMU_DOMAIN_DMA: > - ret = -ENODEV; > - break; > - default: > - ret = -EINVAL; > + mutex_lock(&smmu_domain->init_mutex); > + if (!smmu_domain->smmu) { > + smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > + ret = 0; > } > - > -out_unlock: > mutex_unlock(&smmu_domain->init_mutex); > + > return ret; > } > > @@ -2603,7 +2583,7 @@ static struct iommu_ops arm_smmu_ops = { > .device_group = arm_smmu_device_group, > .dma_use_flush_queue = arm_smmu_dma_use_flush_queue, > .dma_enable_flush_queue = arm_smmu_dma_enable_flush_queue, > - .domain_set_attr = arm_smmu_domain_set_attr, > + .domain_enable_nesting = arm_smmu_domain_enable_nesting, > .of_xlate = arm_smmu_of_xlate, > .get_resv_regions = arm_smmu_get_resv_regions, > .put_resv_regions = generic_iommu_put_resv_regions, > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c > index e7893e96f5177a..2e17d990d04481 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c > @@ -1497,6 +1497,24 @@ static void arm_smmu_dma_enable_flush_queue(struct iommu_domain *domain) > to_smmu_domain(domain)->pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT; > } > > +static int arm_smmu_domain_enable_nesting(struct iommu_domain *domain) > +{ > + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); > + int ret = -EPERM; > + > + if (domain->type != IOMMU_DOMAIN_UNMANAGED) > + return -EINVAL; > + > + mutex_lock(&smmu_domain->init_mutex); > + if (!smmu_domain->smmu) { > + smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > + ret = 0; > + } > + mutex_unlock(&smmu_domain->init_mutex); > + > + return ret; > +} > + > static int arm_smmu_domain_set_attr(struct iommu_domain *domain, > enum iommu_attr attr, void *data) > { > @@ -1508,17 +1526,6 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, > switch(domain->type) { > case IOMMU_DOMAIN_UNMANAGED: > switch (attr) { > - case DOMAIN_ATTR_NESTING: > - if (smmu_domain->smmu) { > - ret = -EPERM; > - goto out_unlock; > - } > - > - if (*(int *)data) > - smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; > - else > - smmu_domain->stage = ARM_SMMU_DOMAIN_S1; > - break; > case DOMAIN_ATTR_IO_PGTABLE_CFG: { > struct io_pgtable_domain_attr *pgtbl_cfg = data; > > @@ -1603,6 +1610,7 @@ static struct iommu_ops arm_smmu_ops = { > .dma_use_flush_queue = arm_smmu_dma_use_flush_queue, > .dma_enable_flush_queue = arm_smmu_dma_enable_flush_queue, > .domain_set_attr = arm_smmu_domain_set_attr, > + .domain_enable_nesting = arm_smmu_domain_enable_nesting, > .of_xlate = arm_smmu_of_xlate, > .get_resv_regions = arm_smmu_get_resv_regions, > .put_resv_regions = generic_iommu_put_resv_regions, > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index eaa80c33f4bc91..0f1374d6612a60 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -5423,32 +5423,22 @@ static bool intel_iommu_is_attach_deferred(struct iommu_domain *domain, > } > > static int > -intel_iommu_domain_set_attr(struct iommu_domain *domain, > - enum iommu_attr attr, void *data) > +intel_iommu_domain_enable_nesting(struct iommu_domain *domain) > { > struct dmar_domain *dmar_domain = to_dmar_domain(domain); > unsigned long flags; > - int ret = 0; > + int ret = -ENODEV; > > if (domain->type != IOMMU_DOMAIN_UNMANAGED) > return -EINVAL; > > - switch (attr) { > - case DOMAIN_ATTR_NESTING: > - spin_lock_irqsave(&device_domain_lock, flags); > - if (nested_mode_support() && > - list_empty(&dmar_domain->devices)) { > - dmar_domain->flags |= DOMAIN_FLAG_NESTING_MODE; > - dmar_domain->flags &= ~DOMAIN_FLAG_USE_FIRST_LEVEL; > - } else { > - ret = -ENODEV; > - } > - spin_unlock_irqrestore(&device_domain_lock, flags); > - break; > - default: > - ret = -EINVAL; > - break; > + spin_lock_irqsave(&device_domain_lock, flags); > + if (nested_mode_support() && list_empty(&dmar_domain->devices)) { > + dmar_domain->flags |= DOMAIN_FLAG_NESTING_MODE; > + dmar_domain->flags &= ~DOMAIN_FLAG_USE_FIRST_LEVEL; > + ret = 0; > } > + spin_unlock_irqrestore(&device_domain_lock, flags); > > return ret; > } > @@ -5556,7 +5546,7 @@ const struct iommu_ops intel_iommu_ops = { > .domain_alloc = intel_iommu_domain_alloc, > .domain_free = intel_iommu_domain_free, > .dma_use_flush_queue = intel_iommu_dma_use_flush_queue, > - .domain_set_attr = intel_iommu_domain_set_attr, > + .domain_enable_nesting = intel_iommu_domain_enable_nesting, > .attach_dev = intel_iommu_attach_device, > .detach_dev = intel_iommu_detach_device, > .aux_attach_dev = intel_iommu_aux_attach_device, > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index 0f12c4d58cdc42..2e9e058501a953 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -2685,6 +2685,14 @@ int iommu_domain_set_attr(struct iommu_domain *domain, > } > EXPORT_SYMBOL_GPL(iommu_domain_set_attr); > > +int iommu_domain_enable_nesting(struct iommu_domain *domain) > +{ > + if (!domain->ops->domain_enable_nesting) > + return -EINVAL; > + return domain->ops->domain_enable_nesting(domain); > +} > +EXPORT_SYMBOL_GPL(iommu_domain_enable_nesting); > + > void iommu_get_resv_regions(struct device *dev, struct list_head *list) > { > const struct iommu_ops *ops = dev->bus->iommu_ops; > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index c8e57f22f421c5..9cea4d80dd66ed 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -2320,10 +2320,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, > } > > if (iommu->nesting) { > - int attr = 1; > - > - ret = iommu_domain_set_attr(domain->domain, DOMAIN_ATTR_NESTING, > - &attr); > + ret = iommu_domain_enable_nesting(domain->domain); > if (ret) > goto out_domain; > } > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index f30de33c6ff56e..aed88aa3bd3edf 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -107,7 +107,6 @@ enum iommu_cap { > */ > > enum iommu_attr { > - DOMAIN_ATTR_NESTING, /* two stages of translation */ > DOMAIN_ATTR_IO_PGTABLE_CFG, > DOMAIN_ATTR_MAX, > }; > @@ -196,6 +195,7 @@ struct iommu_iotlb_gather { > * @dma_use_flush_queue: Returns %true if a DMA flush queue is used > * @dma_enable_flush_queue: Try to enable the DMA flush queue > * @domain_set_attr: Change domain attributes > + * @domain_enable_nesting: Enable nesting > * @get_resv_regions: Request list of reserved regions for a device > * @put_resv_regions: Free list of reserved regions for a device > * @apply_resv_region: Temporary helper call-back for iova reserved ranges > @@ -248,6 +248,7 @@ struct iommu_ops { > void (*dma_enable_flush_queue)(struct iommu_domain *domain); > int (*domain_set_attr)(struct iommu_domain *domain, > enum iommu_attr attr, void *data); > + int (*domain_enable_nesting)(struct iommu_domain *domain); > > /* Request/Free a list of reserved regions for a device */ > void (*get_resv_regions)(struct device *dev, struct list_head *list); > @@ -494,6 +495,7 @@ extern struct iommu_domain *iommu_group_default_domain(struct iommu_group *); > bool iommu_dma_use_flush_queue(struct iommu_domain *domain); > extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr, > void *data); > +int iommu_domain_enable_nesting(struct iommu_domain *domain); > > extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev, > unsigned long iova, int flags); >

1 0

[PATCH] gpu: drm: i915: gt: Rudimentary typo fix in the file intel_timeline.c
by Bhaskar Chowdhury 14 Mar '21

14 Mar '21

s/bariers/barriers/ Signed-off-by: Bhaskar Chowdhury <unixbhaskar(a)gmail.com> --- drivers/gpu/drm/i915/gt/intel_timeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c index 8015964043eb..2b921c1796dc 100644 --- a/drivers/gpu/drm/i915/gt/intel_timeline.c +++ b/drivers/gpu/drm/i915/gt/intel_timeline.c @@ -416,7 +416,7 @@ void intel_timeline_exit(struct intel_timeline *tl) spin_unlock(&timelines->lock); /* - * Since this timeline is idle, all bariers upon which we were waiting + * Since this timeline is idle, all barriers upon which we were waiting * must also be complete and so we can discard the last used barriers * without loss of information. */ -- 2.26.2

2 1

[PATCH] gpu: drm: mediatek: delete redundant printing of return value
by Wang Qing 14 Mar '21

14 Mar '21

platform_get_irq() has already checked and printed the return value, the printing here is nothing special, it is not necessary at all. Signed-off-by: Wang Qing <wangqing(a)vivo.com> --- drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index b05f900..0ac4962 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -751,10 +751,8 @@ static int mtk_dpi_probe(struct platform_device *pdev) } dpi->irq = platform_get_irq(pdev, 0); - if (dpi->irq <= 0) { - dev_err(dev, "Failed to get irq: %d\n", dpi->irq); + if (dpi->irq <= 0) return -EINVAL; - } ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, NULL, &dpi->next_bridge); -- 2.7.4

2 1

← Newer
1
...
56
57
58
59
60
61
62
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2021