Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Jeroen Hofstee <jhofstee@victronenergy.com>
To:     "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
CC:     Jeroen Hofstee <jhofstee@victronenergy.com>,
        Wolfgang Grandegger <wg@grandegger.com>,
        Marc Kleine-Budde <mkl@pengutronix.de>,
        "David S. Miller" <davem@davemloft.net>,
        "open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 7/7] can: ti_hecc: add missing state changes
Thread-Topic: [PATCH 7/7] can: ti_hecc: add missing state changes
Thread-Index: AQHVcwhTFZN1+Mcc4kSaj9AaNLf19Q==
Date:   Tue, 24 Sep 2019 18:46:06 +0000
Message-ID: <20190924184437.10607-8-jhofstee@victronenergy.com>
References: <20190924184437.10607-1-jhofstee@victronenergy.com>
In-Reply-To: <20190924184437.10607-1-jhofstee@victronenergy.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.17.1
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: a152517a-45aa-4291-69ed-08d7411f7584
x-ms-traffictypediagnostic: VI1PR0701MB2847:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <VI1PR0701MB2847B1259127234CF27380C5C0840@VI1PR0701MB2847.eurprd07.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:7691;
x-forefront-prvs: 0170DAF08C
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(376002)(366004)(39850400004)(346002)(136003)(396003)(189003)(199004)(81156014)(86362001)(2906002)(2351001)(14454004)(305945005)(478600001)(8676002)(2501003)(36756003)(7736002)(6116002)(25786009)(8936002)(50226002)(81166006)(46003)(76176011)(11346002)(66476007)(6506007)(6916009)(446003)(102836004)(186003)(2616005)(1076003)(6486002)(66946007)(64756008)(486006)(476003)(66556008)(66446008)(5660300002)(54906003)(71200400001)(71190400001)(14444005)(5640700003)(6436002)(52116002)(386003)(4326008)(256004)(316002)(99286004)(6512007);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0701MB2847;H:VI1PR0701MB2623.eurprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: victronenergy.com does not
 designate permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: SZDYbQVtxLgwQOx0mH80XFAo5mrW6Af/RzR98UMSF3hIMXn22nfvvoGWz/rQD31aQY05RBIJFd9V3rIx2jq5x3OIAjN8mX9UjBqLsO+XQCv0zbJik2iV6alZnlEZvpjhs6Oa/oFmYxYtL7zAxYb5eWHZgMOp7HBzxsN3y8kCm22pm7H4iqavr4MBlxAyiu8ucNdEc6TId2W2ju8ZtW/2MbtU9vGDt+lj8A06Qydrsm0rrv46dYywsa+WkSkFertx96PGNf5+Pd4TaVgLnw4unMBHZCSFnmEQuL1D51RTjEPUBhxG9LMqxTR0FdcnFo7E4DNzYeQ3kJAOQmtkvAY9SUXRaeCYYtfRYWBUn8s1UXYZAqiEwaJr8ugu/w/kIAJRV5fzex8gGLIqofablv3Qr9Y6odYv5eFScG7XjTVi5YE=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: victronenergy.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a152517a-45aa-4291-69ed-08d7411f7584
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2019 18:46:07.0387
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 60b95f08-3558-4e94-b0f8-d690c498e225
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7+5/e2BQifdr6Sf5H3s8ymxoHXpcScFkTPjXWwd58hvENysxBoPr4Bj4uCmZsdK2q2pky66TblL7+I+kMeo3mjN1G9KLUd5YT2d0U7KUPqE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2847
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

While the ti_hecc has interrupts to report when the error counters increase
to a certain level and which change state it doesn't handle the case that
the error counters go down again, so the reported state can actually be
wrong. Since there is no interrupt for that, do update state based on the
error counters, when the state is not error active and goes down again.

Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
---
 drivers/net/can/ti_hecc.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 6098725bfdea..c7c866da9c6a 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -689,6 +689,23 @@ static irqreturn_t ti_hecc_interrupt(int irq, void *de=
v_id)
 			can_bus_off(ndev);
 			change_state(priv, rx_state, tx_state);
 		}
+	} else if (unlikely(priv->can.state !=3D CAN_STATE_ERROR_ACTIVE)) {
+		enum can_state new_state, tx_state, rx_state;
+		u32 rec =3D hecc_read(priv, HECC_CANREC);
+		u32 tec =3D hecc_read(priv, HECC_CANTEC);
+
+		if (rec >=3D 128 || tec >=3D 128)
+			new_state =3D CAN_STATE_ERROR_PASSIVE;
+		else if (rec >=3D 96 || tec >=3D 96)
+			new_state =3D CAN_STATE_ERROR_WARNING;
+		else
+			new_state =3D CAN_STATE_ERROR_ACTIVE;
+
+		if (new_state < priv->can.state) {
+			rx_state =3D rec >=3D tec ? new_state : 0;
+			tx_state =3D rec <=3D tec ? new_state : 0;
+			change_state(priv, rx_state, tx_state);
+		}
 	}
=20
 	if (int_status & HECC_CANGIF_GMIF) {
--=20
2.17.1