From: Alexander Stein <alexander.stein@systec-electronic.com>
To: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Cc: "Rostislav Lisový" <lisovy@gmail.com>,
"Michal Sojka" <sojkam1@fel.cvut.cz>,
"Oliver Hartkopp" <oliver.hartkopp@volkswagen.de>,
linux-can@vger.kernel.org,
"Alexander Stein" <alexander.stein@systec-electronic.com>
Subject: [PATCH 03/11] sllin: Add first support for LIN slave task on slave node
Date: Mon, 16 Dec 2013 08:54:06 +0100 [thread overview]
Message-ID: <1387180454-1738-4-git-send-email-alexander.stein@systec-electronic.com> (raw)
In-Reply-To: <1387180454-1738-1-git-send-email-alexander.stein@systec-electronic.com>
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
sllin/sllin.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 61 insertions(+), 3 deletions(-)
diff --git a/sllin/sllin.c b/sllin/sllin.c
index 36f23a5..3e020b1 100644
--- a/sllin/sllin.c
+++ b/sllin/sllin.c
@@ -113,6 +113,7 @@ enum slstate {
SLSTATE_RESPONSE_WAIT_BUS, /* Wait for response from LIN bus
only (CAN frames from network stack
are not processed in this moment) */
+ SLSTATE_ID_RECEIVED,
SLSTATE_RESPONSE_SENT,
};
@@ -755,10 +756,13 @@ static void sllin_slave_receive_buf(struct tty_struct *tty,
spin_lock_irqsave(&sl->linfr_lock, flags);
+ sl->lin_state = SLSTATE_ID_RECEIVED;
/* Is the length of data set in frame cache? */
if (sce->frame_fl & LIN_CACHE_RESPONSE) {
sl->rx_expect += sce->dlc + 1; /* + checksum */
sl->rx_len_unknown = false;
+ set_bit(SLF_MSGEVENT, &sl->flags);
+ wake_up(&sl->kwt_wq);
} else {
sl->rx_expect += SLLIN_DATA_MAX + 1; /* + checksum */
sl->rx_len_unknown = true;
@@ -784,6 +788,8 @@ static void sllin_slave_receive_buf(struct tty_struct *tty,
sl->rx_expect);
sllin_slave_finish_rx_msg(sl);
+ set_bit(SLF_RXEVENT, &sl->flags);
+ wake_up(&sl->kwt_wq);
}
}
}
@@ -956,7 +962,9 @@ static int sllin_kwthread(void *ptr)
struct tty_struct *tty = sl->tty;
struct sched_param schparam = { .sched_priority = 40 };
int tx_bytes = 0; /* Used for Network statistics */
-
+ unsigned long flags;
+ int lin_id;
+ struct sllin_conf_entry *sce;
netdev_dbg(sl->dev, "sllin_kwthread started.\n");
sched_setscheduler(current, SCHED_FIFO, &schparam);
@@ -984,7 +992,8 @@ static int sllin_kwthread(void *ptr)
test_bit(SLF_TMOUTEVENT, &sl->flags) ||
test_bit(SLF_ERROR, &sl->flags) ||
(((sl->lin_state == SLSTATE_IDLE) ||
- (sl->lin_state == SLSTATE_RESPONSE_WAIT))
+ (sl->lin_state == SLSTATE_RESPONSE_WAIT) ||
+ (sl->lin_state == SLSTATE_ID_RECEIVED))
&& test_bit(SLF_MSGEVENT, &sl->flags)));
if (test_and_clear_bit(SLF_RXEVENT, &sl->flags)) {
@@ -1028,7 +1037,6 @@ static int sllin_kwthread(void *ptr)
/* SFF RTR CAN frame -> LIN header */
if (cf->can_id & CAN_RTR_FLAG) {
- unsigned long flags;
struct sllin_conf_entry *sce;
netdev_dbg(sl->dev, "%s: RTR SFF CAN frame, ID = %x\n",
@@ -1177,6 +1185,56 @@ slstate_response_wait:
sl->lin_state = SLSTATE_IDLE;
break;
+ case SLSTATE_ID_RECEIVED:
+ lin_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
+ sce = &sl->linfr_cache[lin_id];
+ spin_lock_irqsave(&sl->linfr_lock, flags);
+
+ if ((sce->frame_fl & LIN_CACHE_RESPONSE)
+ && (sce->dlc > 0)
+ && (test_bit(SLF_MSGEVENT, &sl->flags))) {
+ int mode;
+
+ netdev_dbg(sl->dev, "Sending LIN response from linfr_cache\n");
+
+ lin_data = sce->data;
+ lin_dlc = sce->dlc;
+ if (lin_dlc > SLLIN_DATA_MAX)
+ lin_dlc = SLLIN_DATA_MAX;
+ memcpy(lin_data_buff, lin_data, lin_dlc);
+ lin_data = lin_data_buff;
+ tx_bytes = lin_dlc;
+
+ mode = SLLIN_STPMSG_RESPONLY;
+ if (sl->rx_buff[SLLIN_BUFF_ID] & LIN_CHECKSUM_EXTENDED)
+ mode |= SLLIN_STPMSG_CHCKSUM_ENH;
+
+ if (sllin_setup_msg(sl, mode, lin_id & LIN_ID_MASK,
+ lin_data, lin_dlc) != -1) {
+
+ sl->rx_expect = sl->tx_lim;
+ sl->data_to_send = true;
+ sl->dev->stats.tx_packets++;
+ sl->dev->stats.tx_bytes += tx_bytes;
+ sl->resp_len_known = true;
+
+ if (!sl->lin_master) {
+ sl->tx_cnt = SLLIN_BUFF_DATA;
+ }
+ sllin_send_tx_buff(sl);
+ }
+
+ clear_bit(SLF_MSGEVENT, &sl->flags);
+ kfree_skb(sl->tx_req_skb);
+ netif_wake_queue(sl->dev);
+ hrtimer_start(&sl->rx_timer,
+ ktime_add(ktime_get(), sl->rx_timer_timeout),
+ HRTIMER_MODE_ABS);
+ }
+ spin_unlock_irqrestore(&sl->linfr_lock, flags);
+ sl->lin_state = SLSTATE_IDLE;
+ break;
+
case SLSTATE_RESPONSE_SENT:
slstate_response_sent:
if (sl->rx_cnt < sl->tx_lim)
--
1.8.3.2
next prev parent reply other threads:[~2013-12-16 7:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 17:16 [RFC] WIP-patches on sllin Alexander Stein
2013-12-10 17:16 ` [PATCH 1/6] sllin: Replace pr_* with netdev_* where approriate Alexander Stein
2013-12-10 17:16 ` [PATCH 2/6] sllin: Make local functions static Alexander Stein
2013-12-10 17:16 ` [PATCH 3/6] sllin: slave: don't forget to wait for the checksum Alexander Stein
2013-12-10 17:16 ` [PATCH 4/6] sllin: reorder functions Alexander Stein
2013-12-10 17:16 ` [PATCH 5/6] sllin: If length is unknown read until timer occurs or break is received Alexander Stein
2013-12-10 17:16 ` [PATCH 6/6] sllin: Add first support for LIN slave task on slave node Alexander Stein
2013-12-13 1:00 ` [RFC] WIP-patches on sllin Pavel Pisa
2013-12-16 7:46 ` Alexander Stein
2013-12-16 7:54 ` [RFC v2] " Alexander Stein
2013-12-16 7:54 ` [PATCH 01/11] sllin: reorder functions Alexander Stein
2013-12-16 7:54 ` [PATCH 02/11] sllin: If length is unknown read until timer occurs or break is received Alexander Stein
2013-12-16 7:54 ` Alexander Stein [this message]
2013-12-16 7:54 ` [PATCH 04/11] sllin: Add version dependent access to termios in tty_struct Alexander Stein
2013-12-16 7:54 ` [PATCH 05/11] sllin: Fix checksum mode decision Alexander Stein
2013-12-16 7:54 ` [PATCH 06/11] sllin: dlc in cache > 0 is the expected LIN frame length Alexander Stein
2013-12-16 7:54 ` [PATCH 07/11] sllin: Do not set SLF_MSGEVENT flag Alexander Stein
2013-12-16 7:54 ` [PATCH 08/11] sllin: signal timeout if there are less than configured characters Alexander Stein
2013-12-16 7:54 ` [PATCH 09/11] sllin: Don't fiddle with netdev queue and skb in slave receive mode Alexander Stein
2013-12-16 7:54 ` [PATCH 10/11] sllin: Add LIN ID to timeout frame Alexander Stein
2013-12-16 7:54 ` [PATCH 11/11] sllin: Evaluate message upon break only if received at least a LIN ID Alexander Stein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387180454-1738-4-git-send-email-alexander.stein@systec-electronic.com \
--to=alexander.stein@systec-electronic.com \
--cc=linux-can@vger.kernel.org \
--cc=lisovy@gmail.com \
--cc=oliver.hartkopp@volkswagen.de \
--cc=pisa@cmp.felk.cvut.cz \
--cc=sojkam1@fel.cvut.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox