Commit 5ffc06eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull habanalabs updates from Greg KH:
 "Here is another round of misc driver patches for 5.15-rc1.

  In here is only updates for the Habanalabs driver. This request is
  late because the previously-objected-to dma-buf patches are all
  removed and some fixes that you and others found are now included in
  here as well.

  All of these have been in linux-next for well over a week with no
  reports of problems, and they are all self-contained to only this one
  driver. Full details are in the shortlog"

* tag 'char-misc-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (61 commits)
  habanalabs/gaudi: hwmon default card name
  habanalabs: add support for f/w reset
  habanalabs/gaudi: block ICACHE_BASE_ADDERESS_HIGH in TPC
  habanalabs: cannot sleep while holding spinlock
  habanalabs: never copy_from_user inside spinlock
  habanalabs: remove unnecessary device status check
  habanalabs: disable IRQ in user interrupts spinlock
  habanalabs: add "in device creation" status
  habanalabs/gaudi: invalidate PMMU mem cache on init
  habanalabs/gaudi: size should be printed in decimal
  habanalabs/gaudi: define DC POWER for secured PMC
  habanalabs/gaudi: unmask out of bounds SLM access interrupt
  habanalabs: add userptr_lookup node in debugfs
  habanalabs/gaudi: fetch TPC/MME ECC errors from F/W
  habanalabs: modify multi-CS to wait on stream masters
  habanalabs/gaudi: add monitored SOBs to state dump
  habanalabs/gaudi: restore user registers when context opens
  habanalabs/gaudi: increase boot fit timeout
  habanalabs: update to latest firmware headers
  habanalabs/gaudi: minimize number of register reads
  ...
parents a668acb8 4cd67adc

Documentation/ABI/testing/debugfs-driver-habanalabs

+19 −0
Original line number Diff line number Diff line
@@ -215,6 +215,17 @@ Description: Sets the skip reset on timeout option for the device. Value of 
                "0" means device will be reset in case some CS has timed out,

                otherwise it will not be reset.



What:           /sys/kernel/debug/habanalabs/hl<n>/state_dump

Date:           Oct 2021

KernelVersion:  5.15

Contact:        ynudelman@habana.ai

Description:    Gets the state dump occurring on a CS timeout or failure.

                State dump is used for debug and is created each time in case of

                a problem in a CS execution, before reset.

                Reading from the node returns the newest state dump available.

                Writing an integer X discards X state dumps, so that the

                next read would return X+1-st newest state dump.



What:           /sys/kernel/debug/habanalabs/hl<n>/stop_on_err

Date:           Mar 2020

KernelVersion:  5.6
@@ -230,6 +241,14 @@ Description: Displays a list with information about the currently user 
                pointers (user virtual addresses) that are pinned and mapped

                to DMA addresses



What:           /sys/kernel/debug/habanalabs/hl<n>/userptr_lookup

Date:           Aug 2021

KernelVersion:  5.15

Contact:        ogabbay@kernel.org

Description:    Allows to search for specific user pointers (user virtual

                addresses) that are pinned and mapped to DMA addresses, and see

                their resolution to the specific dma address.



What:           /sys/kernel/debug/habanalabs/hl<n>/vm

Date:           Jan 2019

KernelVersion:  5.1

drivers/misc/habanalabs/common/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -10,4 +10,5 @@ HL_COMMON_FILES := common/habanalabs_drv.o common/device.o common/context.o \ 
		common/asid.o common/habanalabs_ioctl.o \

		common/command_buffer.o common/hw_queue.o common/irq.o \

		common/sysfs.o common/hwmon.o common/memory.o \

		common/command_submission.o common/firmware_if.o
 
		common/command_submission.o common/firmware_if.o \

		common/state_dump.o

drivers/misc/habanalabs/common/command_buffer.c

+1 −3
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ int hl_cb_create(struct hl_device *hdev, struct hl_cb_mgr *mgr, 


	spin_lock(&mgr->cb_lock);

	rc = idr_alloc(&mgr->cb_handles, cb, 1, 0, GFP_ATOMIC);

	if (rc < 0)

		rc = idr_alloc(&mgr->cb_handles, cb, 1, 0, GFP_KERNEL);

	spin_unlock(&mgr->cb_lock);



	if (rc < 0) {
@@ -552,7 +550,7 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma) 


	vma->vm_private_data = cb;



	rc = hdev->asic_funcs->cb_mmap(hdev, vma, cb->kernel_address,

	rc = hdev->asic_funcs->mmap(hdev, vma, cb->kernel_address,

					cb->bus_address, cb->size);

	if (rc) {

		spin_lock(&cb->lock);