From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AF951922FB for ; Tue, 10 Sep 2024 15:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725982147; cv=none; b=uTgJLMuVLfjQ5wgvaNlx25dEWBWenzsfPOjlUqp6WI8Rz7of7j3bLijcA9hpceZpLSReRGkRL3Ol8ox69B4YR4DjIbooSngD41OHjaC0HrZjYEnUBAGCfMlYbJISbs7CT6Wren3bXMADj3mXnSEWynXC9Wk5blgoUdj+IXa0dEk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725982147; c=relaxed/simple; bh=bYKKDH1pcTzczLC911ccBgziQmQOZ7SdfO/eF7GVhHU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=GO2shJLHGlDdCFDTsoTasA5M8D5lW3nC1HtmNVKtuVGDSZ6N9o4YXYuxjeUQq27YkRJ3tGvfE2jPqzk4jiwkavsP00dFW3HNX37+dnYCn2xr3ToIhS88ivOj9ALD+yPDABFJXf1V/gWfKy1gBn9oaUAU+jNmVZBR+cOaNbklYT8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=YDOW4hSY; arc=none smtp.client-ip=209.85.167.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YDOW4hSY" Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-3e0402a98caso385188b6e.3 for ; Tue, 10 Sep 2024 08:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725982145; x=1726586945; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=dtCCy/Lr6nar/YEsY1Qs666TLKhgRo30yNScB/fYqd8=; b=YDOW4hSYXmoYNEkq9dKIQMukDnNOtf4YvUQxdopXuGmxVmJG8w5SyDozOPkiLTOy4Q L0qrlfphm4Z9gsAs5+Uazg0g3IdEJzbLcFyRmNI+jGWlcEIuycCWlvvn1eaCnCYbNTFE ypSoVfYqLs4IYkXtKBPa5SPTflXvWeiwAvJrZbDH9qaS4fZXPKcmYYzOkAxbsfiFt7L/ Wog1FGz7eP/Wjo0roqnZh5xBKW9xl5ucW1nGfCI0FCQT1sS5A6KNazjX18VVBLmkJqch bBqVSxqOXZ+T7xUrfYazo4N9CvehMLgq70JUzQBNc0pUcu3oJv3tRIGGzLlXSv0kQ8Ex t/Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725982145; x=1726586945; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dtCCy/Lr6nar/YEsY1Qs666TLKhgRo30yNScB/fYqd8=; b=jZyuObWLFZZ0ypcDa45NHuBRKAcvD6+7c6kMhu9Sv/jGXSCKtx6JjNs+kyQFknmp8N +Aby4F/NgOi1BCZDQ9zFQnU2qcTyVHqSBG2Y4Jr9LI2fVqWTBQouhN1WLi2m94aH3cnz KM4kk6RlwHkVyS9LFa14hx9UUTpSkAdpNasZdDbbWO3AEB8Ukx/xqyHhuVHZYZCA7AZw Tqmi4lnvV7zGl+fxEc2M1pSYlLKWS+1uPxOruSkgcnt7NP6KkRifuXKgAV+F8ydNqaXg 1scbjvEbeoxKtxdljk69aAioOL5mS9R8H7zoe7gyfAUT6eq0cIM+3HVmuo9PBlcAWZXH nfvw== X-Forwarded-Encrypted: i=1; AJvYcCX5jk+FC6qo/R255Wpr0tBfKkWrW6JoEUpAlw/hPr9+CTmZihfNSelQDa1Ej8qx4eW30eG9e50vZO5G/ro=@vger.kernel.org X-Gm-Message-State: AOJu0YxJltaqPHvnsVPXdd2bkABqkfrbtDS+wemNaGvB0uReadHN+lJU ZpANC03dtH32aFtPsz182SR8eBdstsHgdXzAN4/akb4N7qscdtmRhtfh8tWntcE= X-Google-Smtp-Source: AGHT+IErRAQeZ0Hl/JEzF5IWPZ6vJR6FZdIf6CsVCDWAFI8dDPPPNQ20QdqyaZ+vsooRQe4sBsvW+Q== X-Received: by 2002:a05:6808:648f:b0:3d9:3a2f:959e with SMTP id 5614622812f47-3e0680b508amr122683b6e.0.1725982145032; Tue, 10 Sep 2024 08:29:05 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:b385:464:5921:35eb]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7d8255dc130sm5764644a12.72.2024.09.10.08.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 08:29:04 -0700 (PDT) Date: Tue, 10 Sep 2024 09:29:02 -0600 From: Mathieu Poirier To: Christophe JAILLET Cc: Bjorn Andersson , Beleswar Padhi , Andrew Davis , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-remoteproc@vger.kernel.org Subject: Re: [PATCH v2] remoteproc: k3-dsp: Fix an error handling path in k3_dsp_rproc_probe() Message-ID: References: <9485e427a9041cc76cfd3dbcc34874af495e160a.1725653543.git.christophe.jaillet@wanadoo.fr> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9485e427a9041cc76cfd3dbcc34874af495e160a.1725653543.git.christophe.jaillet@wanadoo.fr> On Sat, Sep 07, 2024 at 08:33:36AM +0200, Christophe JAILLET wrote: > If an error occurs after the k3_dsp_rproc_request_mbox() call, > mbox_free_channel() must be called, as already done in the remove function. > > Instead of adding an error handling path in the probe and changing all > error handling in the function, add a new devm_add_action_or_reset() and > simplify the .remove() function. > > Fixes: ea1d6fb5b571 ("remoteproc: k3-dsp: Acquire mailbox handle during probe routine") > Signed-off-by: Christophe JAILLET > Reviewed-by: Andrew Davis > --- > Compile tested only > > Change in v2: > - fix the subject (cut'n'paste issue) [Andrew Davis] > - add R-b tag > > v1: https://lore.kernel.org/all/9485e127a00419c76cf13dbccf4874af395ef6ba.1725653543.git.christophe.jaillet@wanadoo.fr/ > --- > drivers/remoteproc/ti_k3_dsp_remoteproc.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c > index 8be3f631c192..f29780de37a5 100644 > --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c > +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c > @@ -610,6 +610,13 @@ static void k3_dsp_release_tsp(void *data) > ti_sci_proc_release(tsp); > } > > +static void k3_dsp_free_channel(void *data) > +{ > + struct k3_dsp_rproc *kproc = data; How did the struct rproc from devm_add_action_or_reset() got turned into a struct k3_dsp_rproc? > + > + mbox_free_channel(kproc->mbox); > +} > + > static int k3_dsp_rproc_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -649,6 +656,10 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) > if (ret) > return ret; > > + ret = devm_add_action_or_reset(dev, k3_dsp_free_channel, rproc); > + if (ret) > + return ret; > + > kproc->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci"); > if (IS_ERR(kproc->ti_sci)) > return dev_err_probe(dev, PTR_ERR(kproc->ti_sci), > @@ -741,8 +752,6 @@ static void k3_dsp_rproc_remove(struct platform_device *pdev) > if (ret) > dev_err(dev, "failed to detach proc (%pe)\n", ERR_PTR(ret)); > } > - > - mbox_free_channel(kproc->mbox); > } > > static const struct k3_dsp_mem_data c66_mems[] = { > -- > 2.46.0 >