android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sound: usb: Unmap secondary event ring before freeing

Browse Source 
USB secondary event ring is being freed before it is being unmap.
Fix this by calling xhci_sec_event_ring_cleanup() after unmapping.
Also move secondary event ring cleanup and unmap related duplicate
code into one API.

Change-Id: I420f53d9e3ad6aa7b310dc354c7d35ce139afbe9
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
This commit is contained in:
Mayank Rana 2020-12-07 13:46:13 -08:00
parent 33569a19db
commit 06d5ffb0f1
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sound/usb/usb_audio_qmi_svc.c
View File

@ -856,6 +856,18 @@ static void uaudio_dev_intf_cleanup(struct usb_device *udev,
info->in_use = false;
}
static void uaudio_event_ring_cleanup_free(struct uaudio_dev *dev)
{
clear_bit(dev->card_num, &uaudio_qdev->card_slot);
/* all audio devices are disconnected */
if (!uaudio_qdev->card_slot) {
uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE,
PAGE_SIZE);
xhci_sec_event_ring_cleanup(dev->udev, uaudio_qdev->intr_num);
uaudio_dbg("all audio devices disconnected\n");
}
}
static void uaudio_dev_cleanup(struct uaudio_dev *dev)
{
int if_idx;
@ -879,17 +891,7 @@ static void uaudio_dev_cleanup(struct uaudio_dev *dev)
/* free interface info */
kfree(dev->info);
dev->info = NULL;
clear_bit(dev->card_num, &uaudio_qdev->card_slot);
/* all audio devices are disconnected */
if (!uaudio_qdev->card_slot) {
uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE,
PAGE_SIZE);
xhci_sec_event_ring_cleanup(dev->udev, uaudio_qdev->intr_num);
uaudio_dbg("all audio devices disconnected\n");
}
uaudio_event_ring_cleanup_free(dev);
dev->udev = NULL;
}
@ -961,17 +963,7 @@ static void uaudio_dev_release(struct kref *kref)
uaudio_dbg("for dev %pK\n", dev);
atomic_set(&dev->in_use, 0);
clear_bit(dev->card_num, &uaudio_qdev->card_slot);
/* all audio devices are disconnected */
if (!uaudio_qdev->card_slot) {
xhci_sec_event_ring_cleanup(dev->udev, uaudio_qdev->intr_num);
uaudio_iommu_unmap(MEM_EVENT_RING, IOVA_BASE, PAGE_SIZE,
PAGE_SIZE);
uaudio_dbg("all audio devices disconnected\n");
}
uaudio_event_ring_cleanup_free(dev);
wake_up(&dev->disconnect_wq);
}