xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'tegra-for-4.13-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Browse Source 
firmware: tegra: Changes for v4.13-rc1

This contains a fix for missing semaphore release in error paths as well
as a bogus error code return in the BPMP firmware implementation.

* tag 'tegra-for-4.13-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  firmware: tegra: Fix locking bugs in BPMP

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2017-06-18 21:01:15 -07:00
parent f39b24e0b4 cd307124ad
commit 43e68aa7b5
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/firmware/tegra/bpmp.c
View File

@@ -211,14 +211,17 @@ static ssize_t tegra_bpmp_channel_read(struct tegra_bpmp_channel *channel,
int index; int index;
index = tegra_bpmp_channel_get_thread_index(channel); index = tegra_bpmp_channel_get_thread_index(channel);
if (index < 0) if (index < 0) {
return index; err = index;
goto unlock;
}
spin_lock_irqsave(&bpmp->lock, flags); spin_lock_irqsave(&bpmp->lock, flags);
err = __tegra_bpmp_channel_read(channel, data, size); err = __tegra_bpmp_channel_read(channel, data, size);
clear_bit(index, bpmp->threaded.allocated); clear_bit(index, bpmp->threaded.allocated);
spin_unlock_irqrestore(&bpmp->lock, flags); spin_unlock_irqrestore(&bpmp->lock, flags);
unlock:
up(&bpmp->threaded.lock); up(&bpmp->threaded.lock);
return err; return err;
@@ -256,18 +259,18 @@ tegra_bpmp_write_threaded(struct tegra_bpmp *bpmp, unsigned int mrq,
index = find_first_zero_bit(bpmp->threaded.allocated, count); index = find_first_zero_bit(bpmp->threaded.allocated, count);
if (index == count) { if (index == count) {
channel = ERR_PTR(-EBUSY); err = -EBUSY;
goto unlock; goto unlock;
} }
channel = tegra_bpmp_channel_get_thread(bpmp, index); channel = tegra_bpmp_channel_get_thread(bpmp, index);
if (!channel) { if (!channel) {
channel = ERR_PTR(-EINVAL); err = -EINVAL;
goto unlock; goto unlock;
} }
if (!tegra_bpmp_master_free(channel)) { if (!tegra_bpmp_master_free(channel)) {
channel = ERR_PTR(-EBUSY); err = -EBUSY;
goto unlock; goto unlock;
} }
@@ -275,16 +278,21 @@ tegra_bpmp_write_threaded(struct tegra_bpmp *bpmp, unsigned int mrq,
err = __tegra_bpmp_channel_write(channel, mrq, MSG_ACK | MSG_RING, err = __tegra_bpmp_channel_write(channel, mrq, MSG_ACK | MSG_RING,
data, size); data, size);
if (err < 0) { if (err < 0)
clear_bit(index, bpmp->threaded.allocated); goto clear_allocated;
goto unlock;
}
set_bit(index, bpmp->threaded.busy); set_bit(index, bpmp->threaded.busy);
unlock:
spin_unlock_irqrestore(&bpmp->lock, flags); spin_unlock_irqrestore(&bpmp->lock, flags);
return channel; return channel;
clear_allocated:
clear_bit(index, bpmp->threaded.allocated);
unlock:
spin_unlock_irqrestore(&bpmp->lock, flags);
up(&bpmp->threaded.lock);
return ERR_PTR(err);
} }
static ssize_t tegra_bpmp_channel_write(struct tegra_bpmp_channel *channel, static ssize_t tegra_bpmp_channel_write(struct tegra_bpmp_channel *channel,