Merge tag 'tegra-for-5.10-firmware' of... (63e15ef1) · Commits · 戴 / test

drivers/firmware/tegra/bpmp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -856,7 +856,8 @@ static const struct tegra_bpmp_soc tegra210_soc = {

		static const struct of_device_id tegra_bpmp_match[] = {
		#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) \|\| \
		IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC)
		IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) \|\| \
		IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)
		{ .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc },
		#endif
		#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

+8 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@
		#include <linux/pm.h>
		#include <linux/slab.h>

		#include <soc/tegra/fuse.h>

		#include <dt-bindings/mailbox/tegra186-hsp.h>

		#include "mailbox.h"
		@@ -322,7 +324,12 @@ static int tegra_hsp_doorbell_startup(struct mbox_chan *chan)
		if (!ccplex)
		return -ENODEV;

		if (!tegra_hsp_doorbell_can_ring(db))
		/*
		* On simulation platforms the BPMP hasn't had a chance yet to mark
		* the doorbell as ringable by the CCPLEX, so we want to skip extra
		* checks here.
		*/
		if (tegra_is_silicon() && !tegra_hsp_doorbell_can_ring(db))
		return -ENODEV;

		spin_lock_irqsave(&hsp->lock, flags);