From patchwork Tue Jul 16 18:12:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Portia Stephens X-Patchwork-Id: 1961226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WNnHH60Kwz20Ct for ; Wed, 17 Jul 2024 04:12:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sTmfV-0005Gh-JP; Tue, 16 Jul 2024 18:12:53 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sTmfU-0005CH-B7 for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2024 18:12:52 +0000 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0C8E3400B0 for ; Tue, 16 Jul 2024 18:12:49 +0000 (UTC) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7a141e44419so863625685a.1 for ; Tue, 16 Jul 2024 11:12:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721153567; x=1721758367; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+BiUziC3xbazwEqZYLYQ3NE8d2DvGgsHAzY6vgB/rSk=; b=hIAFUUGd7fJjhYglki4JSQry0gQI5DubWW+Ig9vj/zP8JypVZ8u1sxB6hr0nqcN62X TwtHY89xLpeMNEWyiRtn7uGF3TvYqmG8tNj0dzEUETTBdgvclZkZAh47j9bx1VPg+NNy LVKv9mOuODsXI3bMraRHcdolM+HlcjZ8RLaObLGZV0b0Dkn3vwlQVhG1Y45SXEnAYt4v Z9qCXYDiAkDjveouLba6muGNs5HjcaikXA83CWo/eaG4bjZj5B8aQ+txJ77HC7VGowg5 2zuDHsr0IAvn49M26Luzht/ZraKJZQT0p4/diMqi0Y5pdK9hc4Su234Tno/G/Ev9QziK qYGQ== X-Gm-Message-State: AOJu0YxynhQ5/iitDBt9CqTYd1Cz80+uZhzF1AcM9EqAQpUGvtT0wXRY muNPfiwmfgzPRljd4zoix4jAAQlwPvgyz5hYeBN6XPGvGupVVu0MwN5zb938TcXi6+04+9Nopjx n2kdIE12FgRGEChkkVZM3wwXb8SQgO8KcJM1tvF+DX+AfoRmfM8RuVG+GgBjKDJfe+x9F0Ac1XA T9R5upnCGdLrSt X-Received: by 2002:a05:620a:4010:b0:79d:58dd:d82b with SMTP id af79cd13be357-7a17b720186mr311224085a.62.1721153567096; Tue, 16 Jul 2024 11:12:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/imLbCz1Ja7ONjFlSc+wz7U+5fUhb8LIaRH2PUidPDQEeABV0FTRorNG8SB0TcxFHnux1hw== X-Received: by 2002:a05:620a:4010:b0:79d:58dd:d82b with SMTP id af79cd13be357-7a17b720186mr311221985a.62.1721153566685; Tue, 16 Jul 2024 11:12:46 -0700 (PDT) Received: from portia-ThinkPad-T490.myfiosgateway.com ([159.196.41.205]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a160be3fc6sm316885385a.67.2024.07.16.11.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 11:12:46 -0700 (PDT) From: Portia Stephens To: kernel-team@lists.ubuntu.com Subject: [SRU] [jammy:linux-xilinx-zynqmp 1/1] Revert "dmaengine: xilinx: dpdma: Fix race condition in vsync IRQ" Date: Tue, 16 Jul 2024 14:12:32 -0400 Message-Id: <20240716181232.72155-2-portia.stephens@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240716181232.72155-1-portia.stephens@canonical.com> References: <20240716181232.72155-1-portia.stephens@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2072456 This reverts commit f14978f798209effb38753f1eb4b1a59044da047. This commit was submitted upstream but not accepted, the commits upstream state was incorrect. This issue was fixed upstream with commit 3a6feb4f69d9 "dma: xilinx_dpdma: Fix locking" . This commit is no longer correct or needed. Signed-off-by: Portia Stephens --- drivers/dma/xilinx/xilinx_dpdma.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/dma/xilinx/xilinx_dpdma.c b/drivers/dma/xilinx/xilinx_dpdma.c index 6b403946741c..90e72d8ef7d2 100644 --- a/drivers/dma/xilinx/xilinx_dpdma.c +++ b/drivers/dma/xilinx/xilinx_dpdma.c @@ -1181,7 +1181,6 @@ static void xilinx_dpdma_chan_vsync_irq(struct xilinx_dpdma_chan *chan) chan->desc.active = pending; chan->desc.pending = NULL; - spin_lock(&chan->vchan.lock); xilinx_dpdma_chan_queue_transfer(chan); spin_unlock(&chan->vchan.lock);