X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Frshim.c;h=86ae68248072bb2d8e3363e6b28665551fbded6c;hb=25a374a187d760eddb87cbe639cb885b159b74b4;hp=881b23f19bd4cf2b6bfd9a475eedc061998380c7;hpb=a6e4aabc66a2335c1bc0da1640df4eefd9a4d604;p=fw%2Fopenocd

diff --git a/src/jtag/drivers/rshim.c b/src/jtag/drivers/rshim.c
index 881b23f19..86ae68248 100644
--- a/src/jtag/drivers/rshim.c
+++ b/src/jtag/drivers/rshim.c
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * Copyright (c) 2020, Mellanox Technologies Ltd. - All Rights Reserved
  * Liming Sun <lsun@mellanox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -282,6 +271,14 @@ static int rshim_ap_q_read(struct adiv5_ap *ap, unsigned int reg,
 	uint32_t addr;
 	int rc = ERROR_OK, tile;
 
+	if (is_adiv6(ap->dap)) {
+		static bool error_flagged;
+		if (!error_flagged)
+			LOG_ERROR("ADIv6 dap not supported by rshim dap-direct mode");
+		error_flagged = true;
+		return ERROR_FAIL;
+	}
+
 	switch (reg) {
 	case ADIV5_MEM_AP_REG_CSW:
 		*data = ap_csw;
@@ -338,6 +335,14 @@ static int rshim_ap_q_write(struct adiv5_ap *ap, unsigned int reg,
 	int rc = ERROR_OK, tile;
 	uint32_t addr;
 
+	if (is_adiv6(ap->dap)) {
+		static bool error_flagged;
+		if (!error_flagged)
+			LOG_ERROR("ADIv6 dap not supported by rshim dap-direct mode");
+		error_flagged = true;
+		return ERROR_FAIL;
+	}
+
 	if (ap_bank != 0) {
 		rshim_dap_retval = ERROR_FAIL;
 		return ERROR_FAIL;