From patchwork Mon Oct 14 15:24:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 13835242 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 983441C6F55 for ; Mon, 14 Oct 2024 15:24:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919492; cv=none; b=Ehk9JMuxSqYCC3C1LVKjZKTNwDt2iPX5ZTgtkRG9je9+hdodzeMtkRNeh+VIkZ1/ymPpPSiAaZe4pvKaG/MNu36AEv9RXtVPmupeUjXnNVvViJU0nlrpdDwzcP+WdlmrSaESUoCIHCgjry+nim11o7rJZvgaIdJhFBChZN7b5jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919492; c=relaxed/simple; bh=P/Am7rBXsNK0N5iJJRQ1pvU7nWegi2LeVq0ySNH9P/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YgKLzv3jIcFEKCsCbg00vwgxmNtopWLAhDOTeQcwj36HyIzSOc58cb8PJmLIOXoPvS3sFtZWzH+t6yYSkT2Yl8sAn8x9e/aSBazhrOaUxbGPPHdyJZjdXuvZfZMVoEyMEz6F3jO5BJXjkVmnXI7W/W/qC8011fvlmD/ynU695NM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com; spf=pass smtp.mailfrom=amarulasolutions.com; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b=P8cydSdK; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="P8cydSdK" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-42f6bec84b5so42836495e9.1 for ; Mon, 14 Oct 2024 08:24:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1728919488; x=1729524288; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aYG5/yu0pXXht36spug+Xg/mIMYx6ohdGwedIw0qEKE=; b=P8cydSdKH7YH+49CQmSeXUuixs1Bq8hLrSa6uZzF9L3AkD+D/kb2zazrWvDlJr8VcD Xh1o//zO9/2dP1xD2Sr3rqHwhqFoXzGD8pp3tcPUg9H45BUn0TvtTc748rEkQkOG4vB8 35U7KOMPLG6HrSUS76SoJwf6eVSfOZawP4EDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728919488; x=1729524288; 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=aYG5/yu0pXXht36spug+Xg/mIMYx6ohdGwedIw0qEKE=; b=fu3vqWpekdcFwHbhWeS030PpMrNpw/cVu50DtNTl2L/AgJmYYsnMimWn8iNizPJdP6 ociwbDtD2arBWntFHVeqEz+NeQX6Iqs5j7CN5X0LfuFvzRaPP3EnxFb7/xnkZGHQa6kP h13psOSM6IRqHjpisBr2Q9dLQfa0TMXJCj3jiggF9524LMUmzc+T9V1RlPUrIDaouTQ+ pBZNsqgfNWnPXGma6RtB1diYWb1LgRlcC/zij6jIPDwu3DUm/B8Rw7eJ/w/4wQCkHSIZ EvGPd3nnpo4CgNL89Be5W8HD54tJ9rVYeA6vD8vzi28yxKy7pPEL3Ccfi2Yu14NLZeIU Z1Gg== X-Forwarded-Encrypted: i=1; AJvYcCUhcwKGhwTusQMqOkMJRTu9gJQVCvdoayqdMbg1TE2YncsJ2CQm/9apww2EouO/D7pRj1MCqHw=@vger.kernel.org X-Gm-Message-State: AOJu0YxujG30S7RJxpf7EbBkNtqG6IXKFUIjxK8sAcaTiaMHYYWFjnVF 7kh8SLIv1r32UDyO8xWdKFFOZ3gE2VN6RrH/pQovjDN9S6Z+gezjP3Sb1qYxhX0= X-Google-Smtp-Source: AGHT+IGZ3IYG7ZvyIsW6OHsWJAHiVpG6rdtl5YUGeUbVWbREtsc/3WlQVldg1bZQLb44Iu2gdNXasA== X-Received: by 2002:a5d:54c2:0:b0:37d:542c:559 with SMTP id ffacd0b85a97d-37d551b6a0fmr8141214f8f.18.1728919487917; Mon, 14 Oct 2024 08:24:47 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.133]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d4b6bd1b7sm11629911f8f.37.2024.10.14.08.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 08:24:47 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi , "David S. Miller" , Eric Dumazet , Frank Li , Haibo Chen , Han Xu , Jakub Kicinski , Marc Kleine-Budde , Paolo Abeni , Rob Herring , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Vincent Mailhol , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC PATCH 4/6] can: flexcan: use helper macros to setup the error frame Date: Mon, 14 Oct 2024 17:24:19 +0200 Message-ID: <20241014152431.2045377-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014152431.2045377-1-dario.binacchi@amarulasolutions.com> References: <20241014152431.2045377-1-dario.binacchi@amarulasolutions.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC The patch replaces the code that directly accesses cf->data[] for setting up the CAN error frame with the appropriate helper macros. Se hai bisogno di ulteriori traduzioni o modifiche, non esitare a chiedere! Signed-off-by: Dario Binacchi --- drivers/net/can/flexcan/flexcan-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c index 790b8e162d73..ca620c8f028c 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -828,33 +828,31 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr) if (unlikely(!skb)) return; - cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR; + CAN_FRAME_ERROR_INIT(cf); if (reg_esr & FLEXCAN_ESR_BIT1_ERR) { netdev_dbg(dev, "BIT1_ERR irq\n"); - cf->data[2] |= CAN_ERR_PROT_BIT1; + CAN_FRAME_SET_ERR_BIT1(cf); } if (reg_esr & FLEXCAN_ESR_BIT0_ERR) { netdev_dbg(dev, "BIT0_ERR irq\n"); - cf->data[2] |= CAN_ERR_PROT_BIT0; + CAN_FRAME_SET_ERR_BIT0(cf); } if (reg_esr & FLEXCAN_ESR_ACK_ERR) { netdev_dbg(dev, "ACK_ERR irq\n"); - cf->can_id |= CAN_ERR_ACK; - cf->data[3] = CAN_ERR_PROT_LOC_ACK; + CAN_FRAME_SET_ERR_ACK(cf); } if (reg_esr & FLEXCAN_ESR_CRC_ERR) { netdev_dbg(dev, "CRC_ERR irq\n"); - cf->data[2] |= CAN_ERR_PROT_BIT; - cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ; + CAN_FRAME_SET_ERR_CRC(cf); } if (reg_esr & FLEXCAN_ESR_FRM_ERR) { netdev_dbg(dev, "FRM_ERR irq\n"); - cf->data[2] |= CAN_ERR_PROT_FORM; + CAN_FRAME_SET_ERR_FORM(cf); } if (reg_esr & FLEXCAN_ESR_STF_ERR) { netdev_dbg(dev, "STF_ERR irq\n"); - cf->data[2] |= CAN_ERR_PROT_STUFF; + CAN_FRAME_SET_ERR_STUFF(cf); } can_update_bus_error_stats(dev, cf);