diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0139-Revert-staging-vchiq-delete-vchiq_killable.h.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0139-Revert-staging-vchiq-delete-vchiq_killable.h.patch | 124 |
1 files changed, 124 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0139-Revert-staging-vchiq-delete-vchiq_killable.h.patch b/target/linux/bcm27xx/patches-5.4/950-0139-Revert-staging-vchiq-delete-vchiq_killable.h.patch new file mode 100644 index 0000000000..0e314ec396 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0139-Revert-staging-vchiq-delete-vchiq_killable.h.patch @@ -0,0 +1,124 @@ +From 74204b27dbadce0bbf1e9bf58db7cac813a14dc6 Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Wed, 6 Mar 2019 16:28:09 +0000 +Subject: [PATCH] Revert "staging: vchiq: delete vchiq_killable.h" + +This reverts commit 2da56630b1cc422f58408033102b8f91ae97bc91. +--- + .../interface/vchiq_arm/vchiq_2835_arm.c | 1 + + .../interface/vchiq_arm/vchiq_arm.c | 1 + + .../interface/vchiq_arm/vchiq_connected.c | 1 + + .../interface/vchiq_arm/vchiq_core.c | 1 + + .../interface/vchiq_arm/vchiq_killable.h | 55 +++++++++++++++++++ + .../interface/vchiq_arm/vchiq_util.c | 1 + + 6 files changed, 60 insertions(+) + create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h + +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +@@ -19,6 +19,7 @@ + + #include "vchiq_arm.h" + #include "vchiq_connected.h" ++#include "vchiq_killable.h" + #include "vchiq_pagelist.h" + + #define MAX_FRAGMENTS (VCHIQ_NUM_CURRENT_BULKS * 2) +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +@@ -28,6 +28,7 @@ + #include "vchiq_ioctl.h" + #include "vchiq_arm.h" + #include "vchiq_debugfs.h" ++#include "vchiq_killable.h" + + #define DEVICE_NAME "vchiq" + +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c +@@ -3,6 +3,7 @@ + + #include "vchiq_connected.h" + #include "vchiq_core.h" ++#include "vchiq_killable.h" + #include <linux/module.h> + #include <linux/mutex.h> + +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +@@ -2,6 +2,7 @@ + /* Copyright (c) 2010-2012 Broadcom. All rights reserved. */ + + #include "vchiq_core.h" ++#include "vchiq_killable.h" + + #define VCHIQ_SLOT_HANDLER_STACK 8192 + +--- /dev/null ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h +@@ -0,0 +1,55 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#ifndef VCHIQ_KILLABLE_H ++#define VCHIQ_KILLABLE_H ++ ++#include <linux/mutex.h> ++#include <linux/semaphore.h> ++ ++#define SHUTDOWN_SIGS (sigmask(SIGKILL) | sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGTRAP) | sigmask(SIGSTOP) | sigmask(SIGCONT)) ++ ++static inline int __must_check down_interruptible_killable(struct semaphore *sem) ++{ ++ /* Allow interception of killable signals only. We don't want to be interrupted by harmless signals like SIGALRM */ ++ int ret; ++ sigset_t blocked, oldset; ++ siginitsetinv(&blocked, SHUTDOWN_SIGS); ++ sigprocmask(SIG_SETMASK, &blocked, &oldset); ++ ret = down_interruptible(sem); ++ sigprocmask(SIG_SETMASK, &oldset, NULL); ++ return ret; ++} ++#define down_interruptible down_interruptible_killable ++ ++#endif +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c +@@ -2,6 +2,7 @@ + /* Copyright (c) 2010-2012 Broadcom. All rights reserved. */ + + #include "vchiq_util.h" ++#include "vchiq_killable.h" + + static inline int is_pow2(int i) + { |