* [PATCH v29 0/6] JTAG driver introduction @ 2020-04-13 22:29 Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 1/6] drivers: jtag: Add JTAG core driver Ernesto Corona ` (6 more replies) 0 siblings, 7 replies; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed; +Cc: Ernesto Corona When a need raise up to use JTAG interface for system's devices programming or CPU debugging, usually the user layer application implements jtag protocol by bit-bang or using a proprietary connection to vendor hardware. This method can be slow and not generic. We propose to implement general JTAG interface and infrastructure to communicate with user layer application. In such way, we can have the standard JTAG interface core part and separation from specific HW implementation. This allow new capability to debug the CPU or program system's device via BMC without additional devices nor cost. This patch purpose is to add JTAG master core infrastructure by defining new JTAG class and provide generic JTAG interface to allow hardware specific drivers to connect this interface. This will enable all JTAG drivers to use the common interface part and will have separate for hardware implementation. The JTAG (Joint Test Action Group) core driver provides minimal generic JTAG interface, which can be used by hardware specific JTAG master controllers. By providing common interface for the JTAG controllers, user space device programing is hardware independent. Modern SoC which in use for embedded system' equipped with internal JTAG master interface. This interface is used for programming and debugging system's hardware components, like CPLD, FPGA, CPU, voltage and industrial controllers. Firmware for such devices can be upgraded through JTAG interface during Runtime. The JTAG standard support for multiple devices programming, is in case their lines are daisy-chained together. For example, systems which equipped with host CPU, BMC SoC or/and number of programmable devices are capable to connect a pin and select system components dynamically for programming and debugging, This is using by the BMC which is equipped with internal SoC master controller. For example: BMC JTAG master --> pin selected to CPLDs chain for programming (filed upgrade, production) BMC JTAG master --> pin selected to voltage monitors for programming (field upgrade, production) BMC JTAG master --> pin selected to host CPU (on-site debugging and developers debugging) For example, we can have application in user space which using calls to JTAG driver executes CPLD programming directly from SVF file The JTAG standard (IEEE 1149.1) defines the next connector pins: - TDI (Test Data In); - TDO (Test Data Out); - TCK (Test Clock); - TMS (Test Mode Select); - TRST (Test Reset) (Optional); The SoC equipped with JTAG master controller, performs device programming on command or vector level. For example a file in a standard SVF (Serial Vector Format) that contains boundary scan vectors, can be used by sending each vector to the JTAG interface and the JTAG controller will execute the programming. Initial version provides the system calls set for: - SIR (Scan Instruction Register, IEEE 1149.1 Instruction Register scan); - SDR (Scan Data Register, IEEE 1149.1 Data Register scan); - RUNTEST (Forces the IEEE 1149.1 bus to a run state for a specified number of clocks. SoC which are not equipped with JTAG master interface, can be built on top of JTAG core driver infrastructure, by applying bit-banging of TDI, TDO, TCK and TMS pins within the hardware specific driver. Oleksandr Shamray (4): Ernesto Corona (6): drivers: jtag: Add JTAG core driver dt-binding: jtag: Aspeed 2400 and 2500 series Add Aspeed SoC 24xx and 25xx families JTAG master driver Documentation: jtag: Add ABI documentation Documentation jtag: Add JTAG core driver ioctl number drivers: jtag: Add JTAG core driver Maintainers Documentation/ABI/testing/jtag-dev | 23 + .../devicetree/bindings/jtag/aspeed-jtag.yaml | 71 ++ Documentation/index.rst | 1 + Documentation/jtag/index.rst | 18 + Documentation/jtag/jtag-summary.rst | 47 + Documentation/jtag/jtagdev.rst | 194 ++++ .../userspace-api/ioctl/ioctl-number.rst | 2 + MAINTAINERS | 11 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/jtag/Kconfig | 31 + drivers/jtag/Makefile | 2 + drivers/jtag/jtag-aspeed.c | 1027 +++++++++++++++++ drivers/jtag/jtag.c | 301 +++++ include/linux/jtag.h | 44 + include/uapi/linux/jtag.h | 194 ++++ 16 files changed, 1969 insertions(+) create mode 100644 Documentation/ABI/testing/jtag-dev create mode 100644 Documentation/devicetree/bindings/jtag/aspeed-jtag.yaml create mode 100644 Documentation/jtag/index.rst create mode 100644 Documentation/jtag/jtag-summary.rst create mode 100644 Documentation/jtag/jtagdev.rst create mode 100644 drivers/jtag/Kconfig create mode 100644 drivers/jtag/Makefile create mode 100644 drivers/jtag/jtag-aspeed.c create mode 100644 drivers/jtag/jtag.c create mode 100644 include/linux/jtag.h create mode 100644 include/uapi/linux/jtag.h -- 2.17.1 ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v29 1/6] drivers: jtag: Add JTAG core driver 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona @ 2020-04-13 22:29 ` Ernesto Corona 2021-01-15 11:18 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 2/6] dt-binding: jtag: Aspeed 2400 and 2500 series Ernesto Corona ` (5 subsequent siblings) 6 siblings, 1 reply; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Cc: Ernesto Corona, Oleksandr Shamray, Jiri Pirko, Greg Kroah-Hartman, Arnd Bergmann, Boris Brezillon, Randy Dunlap, Johan Hovold, Jens Axboe, Joel Stanley, Palmer Dabbelt, Kees Cook, William Breathitt Gray, Federico Vaga, Jonathan Cameron, Tony Luck, Christian Gromm, Linus Walleij, Yiwei Zhang, Alessandro Rubini, Viresh Kumar, Mika Westerberg, Steven Filary, Vadim Pasternak, Amithash Prasad, Patrick Williams, Rgrs JTAG class driver provide infrastructure to support hardware/software JTAG platform drivers. It provide user layer API interface for flashing and debugging external devices which equipped with JTAG interface using standard transactions. Driver exposes set of IOCTL to user space for: - XFER: SIR (Scan Instruction Register, IEEE 1149.1 Data Register scan); SDR (Scan Data Register, IEEE 1149.1 Instruction Register scan); - GIOCSTATUS read the current TAPC state of the JTAG controller - SIOCSTATE Forces the JTAG TAPC to go into a particular state. - SIOCFREQ/GIOCFREQ for setting and reading JTAG frequency. - IOCBITBANG for low level control of JTAG signals. Driver core provides set of internal APIs for allocation and registration: - jtag_register; - jtag_unregister; - jtag_alloc; - jtag_free; Platform driver on registration with jtag-core creates the next entry in dev folder: /dev/jtagX Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> Acked-by: Philippe Ombredanne <pombredanne@nexb.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Johan Hovold <johan@kernel.org> Cc: Jens Axboe <axboe@kernel.dk> Cc: Joel Stanley <joel@jms.id.au> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Kees Cook <keescook@chromium.org> Cc: William Breathitt Gray <vilhelm.gray@gmail.com> Cc: Federico Vaga <federico.vaga@cern.ch> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Christian Gromm <christian.gromm@microchip.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Yiwei Zhang <zzyiwei@google.com> Cc: Alessandro Rubini <rubini@gnudd.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Steven Filary <steven.a.filary@intel.com> Cc: Vadim Pasternak <vadimp@mellanox.com> Cc: Amithash Prasad <amithash@fb.com> Cc: Patrick Williams <patrickw3@fb.com> Cc: Rgrs <rgrs@protonmail.com> --- v28->v29 v27->v28 Comments pointed by Steven Filary <steven.a.filary@intel.com> - Replace JTAG_IOCRUNTEST with JTAG_SIOCSTATE adding support for all TAPC end states in SW mode using a lookup table to navigate across states. - Add support for simultaneous READ/WRITE transfers(JTAG_READ_WRITE_XFER). - Support for switching JTAG controller mode between slave and master mode. - Setup JTAG controller mode to master only when the driver is opened, letting other HW to own the JTAG bus when it isn't in use. - Include JTAG bit bang IOCTL for low level JTAG control usage (JTAG_IOCBITBANG). v24->v25 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - set values to enums in jtag.h v23->v24 Notifications from kbuild test robot <lkp@intel.com> - Add include types.h header to jtag.h - remove unecessary jtag_release v22->v23 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - remove restriction of allocated JTAG devs- - add validation fo idle values - remove unnecessary blank line - change retcode for xfer - remove unecessary jtag_release callback - remove unecessary defined fron jtag.h - align in one line define JTAG_IOCRUNTEST v21->v22 Comments pointed by Andy Shevchenko <andy.shevchenko@gmail.com> - Fix 0x0f -> 0x0F in ioctl-number.txt - Add description to #define MAX_JTAG_NAME_LEN - Remove unnecessary entry *dev from struct jtag - Remove redundant parens - Described mandatory callbacks and removed unnecessary - Set JTAG_MAX_XFER_DATA_LEN to power of 2 - rework driver alloc/register to devm_ variant - increasing line length up to 84 in order to improve readability. Comments pointed by Randy Dunlap <rdunlap@infradead.org> - fix spell in ABI doccumentation v20->v21 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - Fix JTAG dirver help in Kconfig v19->v20 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - Fix JTAG dirver help in Kconfig Notifications from kbuild test robot <lkp@intel.com> - fix incompatible type casts v18->v19 Comments pointed by Julia Cartwright <juliac@eso.teric.us> - Fix memory leak on jtag_alloc exit v17->v18 Comments pointed by Julia Cartwright <juliac@eso.teric.us> - Change to return -EOPNOTSUPP in case of error in JTAG_GIOCFREQ - Add ops callbacks check to jtag_alloc - Add err check for copy_to_user - Move the kfree() above the if (err) in JTAG_IOCXFER - remove unnecessary check for error after put_user - add padding to struct jtag_xfer v16->v17 Comments pointed by Julia Cartwright <juliac@eso.teric.us> - Fix memory allocation on jtag alloc - Move out unnecessary form lock on jtag open - Rework jtag register behavior v15->v16 Comments pointed by Florian Fainelli <f.fainelli@gmail.com> - move check jtag->ops->* in ioctl before get_user() - change error type -EINVAL --> -EBUSY on open already opened jtag - remove unnecessary ARCH_DMA_MINALIGN flag from kzalloc - remove define ARCH_DMA_MINALIGN v14->v15 v13->v14 Comments pointed by Philippe Ombredanne <pombredanne@nexb.com> - Change style of head block comment from /**/ to // v12->v13 Comments pointed by Philippe Ombredanne <pombredanne@nexb.com> - Change jtag.c licence type to SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note and reorder line with license in description v11->v12 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - Change jtag.h licence type to SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note and reorder line with license in description Comments pointed by Chip Bilbrey <chip@bilbrey.org> - Remove Apeed reference from uapi jtag.h header - Remove access mode from xfer and idle transactions - Add new ioctl JTAG_SIOCMODE for set hw mode - Add single open per device blocking v10->v11 Notifications from kbuild test robot <lkp@intel.com> - Add include types.h header to jtag.h - fix incompatible type of xfer callback - remove rdundant class defination - Fix return order in case of xfer error V9->v10 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - remove unnecessary alignment for pirv data - move jtag_copy_to_user and jtag_copy_from_user code just to ioctl - move int jtag_run_test_idle_op and jtag_xfer_op code just to ioctl - change return error codes to more applicable - add missing error checks - fix error check order in ioctl - remove unnecessary blank lines - add param validation to ioctl - remove compat_ioctl - remove only one open per JTAG port blocking. User will care about this. - Fix idr memory leak on jtag_exit - change cdev device type to misc V8->v9 Comments pointed by Arnd Bergmann <arnd@arndb.de> - use get_user() instead of __get_user(). - change jtag->open type from int to atomic_t - remove spinlock on jtg_open - remove mutex on jtag_register - add unregister_chrdev_region on jtag_init err - add unregister_chrdev_region on jtag_exit - remove unnecessary pointer casts - add *data parameter to xfer function prototype v7->v8 Comments pointed by Moritz Fischer <moritz.fischer@ettus.com> - Fix misspelling s/friver/driver v6->v7 Notifications from kbuild test robot <lkp@intel.com> - Remove include asm/types.h from jtag.h - Add include <linux/types.h> to jtag.c v5->v6 v4->v5 v3->v4 Comments pointed by Arnd Bergmann <arnd@arndb.de> - change transaction pointer tdio type to __u64 - change internal status type from enum to __u32 - reorder jtag_xfer members to avoid the implied padding - add __packed attribute to jtag_xfer and jtag_run_test_idle v2->v3 Notifications from kbuild test robot <lkp@intel.com> - Change include path to <linux/types.h> in jtag.h v1->v2 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - Change license type from GPLv2/BSD to GPLv2 - Change type of variables which crossed user/kernel to __type - Remove "default n" from Kconfig Comments pointed by Andrew Lunn <andrew@lunn.ch> - Change list_add_tail in jtag_unregister to list_del Comments pointed by Neil Armstrong <narmstrong@baylibre.com> - Add SPDX-License-Identifier instead of license text Comments pointed by Arnd Bergmann <arnd@arndb.de> - Change __copy_to_user to memdup_user - Change __put_user to put_user - Change type of variables to __type for compatible 32 and 64-bit systems - Add check for maximum xfer data size - Change lookup data mechanism to get jtag data from inode - Add .compat_ioctl to file ops - Add mem alignment for jtag priv data Comments pointed by Tobias Klauser <tklauser@distanz.ch> - Change function names to avoid match with variable types - Fix description for jtag_ru_test_idle in uapi jtag.h - Fix misprints IDEL/IDLE, trough/through --- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/jtag/Kconfig | 17 +++ drivers/jtag/Makefile | 1 + drivers/jtag/jtag.c | 301 ++++++++++++++++++++++++++++++++++++++ include/linux/jtag.h | 44 ++++++ include/uapi/linux/jtag.h | 194 ++++++++++++++++++++++++ 7 files changed, 560 insertions(+) create mode 100644 drivers/jtag/Kconfig create mode 100644 drivers/jtag/Makefile create mode 100644 drivers/jtag/jtag.c create mode 100644 include/linux/jtag.h create mode 100644 include/uapi/linux/jtag.h diff --git a/drivers/Kconfig b/drivers/Kconfig index dcecc9f6e33f..e35051059ad6 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -235,4 +235,6 @@ source "drivers/interconnect/Kconfig" source "drivers/counter/Kconfig" source "drivers/most/Kconfig" + +source "drivers/jtag/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index c0cd1b9075e3..fda1dfac8da7 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -188,3 +188,4 @@ obj-$(CONFIG_GNSS) += gnss/ obj-$(CONFIG_INTERCONNECT) += interconnect/ obj-$(CONFIG_COUNTER) += counter/ obj-$(CONFIG_MOST) += most/ +obj-$(CONFIG_JTAG) += jtag/ diff --git a/drivers/jtag/Kconfig b/drivers/jtag/Kconfig new file mode 100644 index 000000000000..47771fcd3c5b --- /dev/null +++ b/drivers/jtag/Kconfig @@ -0,0 +1,17 @@ +menuconfig JTAG + tristate "JTAG support" + help + This provides basic core functionality support for JTAG class devices. + Hardware that is equipped with a JTAG microcontroller can be + supported by using this driver's interfaces. + This driver exposes a set of IOCTLs to the user space for + the following commands: + SDR: Performs an IEEE 1149.1 Data Register scan + SIR: Performs an IEEE 1149.1 Instruction Register scan. + RUNTEST: Forces the IEEE 1149.1 bus to a run state for a specified + number of clocks or a specified time period. + + If you want this support, you should say Y here. + + To compile this driver as a module, choose M here: the module will + be called jtag. diff --git a/drivers/jtag/Makefile b/drivers/jtag/Makefile new file mode 100644 index 000000000000..af374939a9e6 --- /dev/null +++ b/drivers/jtag/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_JTAG) += jtag.o diff --git a/drivers/jtag/jtag.c b/drivers/jtag/jtag.c new file mode 100644 index 000000000000..47503a102f64 --- /dev/null +++ b/drivers/jtag/jtag.c @@ -0,0 +1,301 @@ +// SPDX-License-Identifier: GPL-2.0-only +// drivers/jtag/jtag.c +// +// Copyright (c) 2018 Mellanox Technologies. All rights reserved. +// Copyright (c) 2018 Oleksandr Shamray <oleksandrs@mellanox.com> + +#include <linux/cdev.h> +#include <linux/device.h> +#include <linux/jtag.h> +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/miscdevice.h> +#include <linux/module.h> +#include <linux/rtnetlink.h> +#include <linux/spinlock.h> +#include <linux/types.h> +#include <uapi/linux/jtag.h> + +struct jtag { + struct miscdevice miscdev; + const struct jtag_ops *ops; + int id; + unsigned long priv[0]; +}; + +static DEFINE_IDA(jtag_ida); + +void *jtag_priv(struct jtag *jtag) +{ + return jtag->priv; +} +EXPORT_SYMBOL_GPL(jtag_priv); + +static long jtag_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + struct jtag *jtag = file->private_data; + struct jtag_end_tap_state endstate; + struct jtag_xfer xfer; + struct tck_bitbang bitbang; + struct jtag_mode mode; + u8 *xfer_data; + u32 data_size; + u32 value; + int err; + + if (!arg) + return -EINVAL; + + switch (cmd) { + case JTAG_GIOCFREQ: + if (!jtag->ops->freq_get) + return -EOPNOTSUPP; + + err = jtag->ops->freq_get(jtag, &value); + if (err) + break; + + if (put_user(value, (__u32 __user *)arg)) + err = -EFAULT; + break; + + case JTAG_SIOCFREQ: + if (!jtag->ops->freq_set) + return -EOPNOTSUPP; + + if (get_user(value, (__u32 __user *)arg)) + return -EFAULT; + if (value == 0) + return -EINVAL; + + err = jtag->ops->freq_set(jtag, value); + break; + + case JTAG_SIOCSTATE: + if (copy_from_user(&endstate, (const void __user *)arg, + sizeof(struct jtag_end_tap_state))) + return -EFAULT; + + if (endstate.endstate > JTAG_STATE_UPDATEIR) + return -EINVAL; + + if (endstate.reset > JTAG_FORCE_RESET) + return -EINVAL; + + err = jtag->ops->status_set(jtag, &endstate); + break; + + case JTAG_IOCXFER: + if (copy_from_user(&xfer, (const void __user *)arg, + sizeof(struct jtag_xfer))) + return -EFAULT; + + if (xfer.length >= JTAG_MAX_XFER_DATA_LEN) + return -EINVAL; + + if (xfer.type > JTAG_SDR_XFER) + return -EINVAL; + + if (xfer.direction > JTAG_READ_WRITE_XFER) + return -EINVAL; + + if (xfer.endstate > JTAG_STATE_UPDATEIR) + return -EINVAL; + + data_size = DIV_ROUND_UP(xfer.length, BITS_PER_BYTE); + xfer_data = memdup_user(u64_to_user_ptr(xfer.tdio), data_size); + if (IS_ERR(xfer_data)) + return -EFAULT; + + err = jtag->ops->xfer(jtag, &xfer, xfer_data); + if (err) { + kfree(xfer_data); + return err; + } + + err = copy_to_user(u64_to_user_ptr(xfer.tdio), + (void *)xfer_data, data_size); + kfree(xfer_data); + if (err) + return -EFAULT; + + if (copy_to_user((void __user *)arg, (void *)&xfer, + sizeof(struct jtag_xfer))) + return -EFAULT; + break; + + case JTAG_GIOCSTATUS: + err = jtag->ops->status_get(jtag, &value); + if (err) + break; + + err = put_user(value, (__u32 __user *)arg); + break; + case JTAG_IOCBITBANG: + if (copy_from_user(&bitbang, (const void __user *)arg, + sizeof(struct tck_bitbang))) + return -EFAULT; + err = jtag->ops->bitbang(jtag, &bitbang); + if (err) + break; + + if (copy_to_user((void __user *)arg, (void *)&bitbang, + sizeof(struct tck_bitbang))) + return -EFAULT; + break; + case JTAG_SIOCMODE: + if (!jtag->ops->mode_set) + return -EOPNOTSUPP; + + if (copy_from_user(&mode, (const void __user *)arg, + sizeof(struct jtag_mode))) + return -EFAULT; + + err = jtag->ops->mode_set(jtag, &mode); + break; + + default: + return -EINVAL; + } + return err; +} + +static int jtag_open(struct inode *inode, struct file *file) +{ + struct jtag *jtag = container_of(file->private_data, + struct jtag, + miscdev); + + file->private_data = jtag; + if (jtag->ops->enable(jtag)) + return -EBUSY; + return nonseekable_open(inode, file); +} + +static int jtag_release(struct inode *inode, struct file *file) +{ + struct jtag *jtag = file->private_data; + + if (jtag->ops->disable(jtag)) + return -EBUSY; + return 0; +} + +static const struct file_operations jtag_fops = { + .owner = THIS_MODULE, + .open = jtag_open, + .llseek = noop_llseek, + .unlocked_ioctl = jtag_ioctl, + .release = jtag_release, +}; + +struct jtag *jtag_alloc(struct device *host, size_t priv_size, + const struct jtag_ops *ops) +{ + struct jtag *jtag; + + if (!host) + return NULL; + + if (!ops) + return NULL; + + if (!ops->status_set || !ops->status_get || !ops->xfer) + return NULL; + + jtag = kzalloc(sizeof(*jtag) + priv_size, GFP_KERNEL); + if (!jtag) + return NULL; + + jtag->ops = ops; + jtag->miscdev.parent = host; + + return jtag; +} +EXPORT_SYMBOL_GPL(jtag_alloc); + +void jtag_free(struct jtag *jtag) +{ + kfree(jtag); +} +EXPORT_SYMBOL_GPL(jtag_free); + +static int jtag_register(struct jtag *jtag) +{ + struct device *dev = jtag->miscdev.parent; + int err; + int id; + + if (!dev) + return -ENODEV; + + id = ida_simple_get(&jtag_ida, 0, 0, GFP_KERNEL); + if (id < 0) + return id; + + jtag->id = id; + + jtag->miscdev.fops = &jtag_fops; + jtag->miscdev.minor = MISC_DYNAMIC_MINOR; + jtag->miscdev.name = kasprintf(GFP_KERNEL, "jtag%d", id); + if (!jtag->miscdev.name) { + err = -ENOMEM; + goto err_jtag_alloc; + } + + err = misc_register(&jtag->miscdev); + if (err) { + dev_err(jtag->miscdev.parent, "Unable to register device\n"); + goto err_jtag_name; + } + return 0; + +err_jtag_name: + kfree(jtag->miscdev.name); +err_jtag_alloc: + ida_simple_remove(&jtag_ida, id); + return err; +} + +static void jtag_unregister(struct jtag *jtag) +{ + misc_deregister(&jtag->miscdev); + kfree(jtag->miscdev.name); + ida_simple_remove(&jtag_ida, jtag->id); +} + +static void devm_jtag_unregister(struct device *dev, void *res) +{ + jtag_unregister(*(struct jtag **)res); +} + +int devm_jtag_register(struct device *dev, struct jtag *jtag) +{ + struct jtag **ptr; + int ret; + + ptr = devres_alloc(devm_jtag_unregister, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + ret = jtag_register(jtag); + if (!ret) { + *ptr = jtag; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + return ret; +} +EXPORT_SYMBOL_GPL(devm_jtag_register); + +static void __exit jtag_exit(void) +{ + ida_destroy(&jtag_ida); +} + +module_exit(jtag_exit); + +MODULE_AUTHOR("Oleksandr Shamray <oleksandrs@mellanox.com>"); +MODULE_DESCRIPTION("Generic jtag support"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/jtag.h b/include/linux/jtag.h new file mode 100644 index 000000000000..4153c905e550 --- /dev/null +++ b/include/linux/jtag.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +// include/linux/jtag.h - JTAG class driver +// +// Copyright (c) 2018 Mellanox Technologies. All rights reserved. +// Copyright (c) 2018 Oleksandr Shamray <oleksandrs@mellanox.com> + +#ifndef __JTAG_H +#define __JTAG_H + +#include <linux/types.h> +#include <uapi/linux/jtag.h> + +#define JTAG_MAX_XFER_DATA_LEN 65535 + +struct jtag; +/** + * struct jtag_ops - callbacks for JTAG control functions: + * + * @freq_get: get frequency function. Filled by dev driver + * @freq_set: set frequency function. Filled by dev driver + * @status_get: get JTAG TAPC state function. Mandatory, Filled by dev driver + * @status_set: set JTAG TAPC state function. Mandatory, Filled by dev driver + * @xfer: send JTAG xfer function. Mandatory func. Filled by dev driver + * @mode_set: set specific work mode for JTAG. Filled by dev driver + */ +struct jtag_ops { + int (*freq_get)(struct jtag *jtag, u32 *freq); + int (*freq_set)(struct jtag *jtag, u32 freq); + int (*status_get)(struct jtag *jtag, u32 *state); + int (*status_set)(struct jtag *jtag, struct jtag_end_tap_state *endst); + int (*xfer)(struct jtag *jtag, struct jtag_xfer *xfer, u8 *xfer_data); + int (*mode_set)(struct jtag *jtag, struct jtag_mode *jtag_mode); + int (*bitbang)(struct jtag *jtag, struct tck_bitbang *tck_bitbang); + int (*enable)(struct jtag *jtag); + int (*disable)(struct jtag *jtag); +}; + +void *jtag_priv(struct jtag *jtag); +int devm_jtag_register(struct device *dev, struct jtag *jtag); +struct jtag *jtag_alloc(struct device *host, size_t priv_size, + const struct jtag_ops *ops); +void jtag_free(struct jtag *jtag); + +#endif /* __JTAG_H */ diff --git a/include/uapi/linux/jtag.h b/include/uapi/linux/jtag.h new file mode 100644 index 000000000000..3f9e1953f5a4 --- /dev/null +++ b/include/uapi/linux/jtag.h @@ -0,0 +1,194 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +// include/uapi/linux/jtag.h - JTAG class driver uapi +// +// Copyright (c) 2018 Mellanox Technologies. All rights reserved. +// Copyright (c) 2018 Oleksandr Shamray <oleksandrs@mellanox.com> + +#ifndef __UAPI_LINUX_JTAG_H +#define __UAPI_LINUX_JTAG_H + +/* + * JTAG_XFER_MODE: JTAG transfer mode. Used to set JTAG controller transfer mode + * This is bitmask for feature param in jtag_mode for ioctl JTAG_SIOCMODE + */ +#define JTAG_XFER_MODE 0 +/* + * JTAG_CONTROL_MODE: JTAG controller mode. Used to set JTAG controller mode + * This is bitmask for feature param in jtag_mode for ioctl JTAG_SIOCMODE + */ +#define JTAG_CONTROL_MODE 1 +/* + * JTAG_SLAVE_MODE: JTAG slave mode. Used to set JTAG controller slave mode + * This is bitmask for mode param in jtag_mode for ioctl JTAG_SIOCMODE + */ +#define JTAG_SLAVE_MODE 0 +/* + * JTAG_MASTER_MODE: JTAG master mode. Used to set JTAG controller master mode + * This is bitmask for mode param in jtag_mode for ioctl JTAG_SIOCMODE + */ +#define JTAG_MASTER_MODE 1 +/* + * JTAG_XFER_HW_MODE: JTAG hardware mode. Used to set HW drived or bitbang + * mode. This is bitmask for mode param in jtag_mode for ioctl JTAG_SIOCMODE + */ +#define JTAG_XFER_HW_MODE 1 +/* + * JTAG_XFER_SW_MODE: JTAG software mode. Used to set SW drived or bitbang + * mode. This is bitmask for mode param in jtag_mode for ioctl JTAG_SIOCMODE + */ +#define JTAG_XFER_SW_MODE 0 + +/** + * enum jtag_endstate: + * + * @JTAG_STATE_TLRESET: JTAG state machine Test Logic Reset state + * @JTAG_STATE_IDLE: JTAG state machine IDLE state + * @JTAG_STATE_SELECTDR: JTAG state machine SELECT_DR state + * @JTAG_STATE_CAPTUREDR: JTAG state machine CAPTURE_DR state + * @JTAG_STATE_SHIFTDR: JTAG state machine SHIFT_DR state + * @JTAG_STATE_EXIT1DR: JTAG state machine EXIT-1 DR state + * @JTAG_STATE_PAUSEDR: JTAG state machine PAUSE_DR state + * @JTAG_STATE_EXIT2DR: JTAG state machine EXIT-2 DR state + * @JTAG_STATE_UPDATEDR: JTAG state machine UPDATE DR state + * @JTAG_STATE_SELECTIR: JTAG state machine SELECT_IR state + * @JTAG_STATE_CAPTUREIR: JTAG state machine CAPTURE_IR state + * @JTAG_STATE_SHIFTIR: JTAG state machine SHIFT_IR state + * @JTAG_STATE_EXIT1IR: JTAG state machine EXIT-1 IR state + * @JTAG_STATE_PAUSEIR: JTAG state machine PAUSE_IR state + * @JTAG_STATE_EXIT2IR: JTAG state machine EXIT-2 IR state + * @JTAG_STATE_UPDATEIR: JTAG state machine UPDATE IR state + */ +enum jtag_endstate { + JTAG_STATE_TLRESET, + JTAG_STATE_IDLE, + JTAG_STATE_SELECTDR, + JTAG_STATE_CAPTUREDR, + JTAG_STATE_SHIFTDR, + JTAG_STATE_EXIT1DR, + JTAG_STATE_PAUSEDR, + JTAG_STATE_EXIT2DR, + JTAG_STATE_UPDATEDR, + JTAG_STATE_SELECTIR, + JTAG_STATE_CAPTUREIR, + JTAG_STATE_SHIFTIR, + JTAG_STATE_EXIT1IR, + JTAG_STATE_PAUSEIR, + JTAG_STATE_EXIT2IR, + JTAG_STATE_UPDATEIR +}; + +/** + * enum jtag_reset: + * + * @JTAG_NO_RESET: JTAG run TAP from current state + * @JTAG_FORCE_RESET: JTAG force TAP to reset state + */ +enum jtag_reset { + JTAG_NO_RESET = 0, + JTAG_FORCE_RESET = 1, +}; + +/** + * enum jtag_xfer_type: + * + * @JTAG_SIR_XFER: SIR transfer + * @JTAG_SDR_XFER: SDR transfer + */ +enum jtag_xfer_type { + JTAG_SIR_XFER = 0, + JTAG_SDR_XFER = 1, +}; + +/** + * enum jtag_xfer_direction: + * + * @JTAG_READ_XFER: read transfer + * @JTAG_WRITE_XFER: write transfer + * @JTAG_READ_WRITE_XFER: read & write transfer + */ +enum jtag_xfer_direction { + JTAG_READ_XFER = 1, + JTAG_WRITE_XFER = 2, + JTAG_READ_WRITE_XFER = 3, +}; + +/** + * struct jtag_end_tap_state - forces JTAG state machine to go into a TAPC + * state + * + * @reset: 0 - run IDLE/PAUSE from current state + * 1 - go through TEST_LOGIC/RESET state before IDLE/PAUSE + * @end: completion flag + * @tck: clock counter + * + * Structure provide interface to JTAG device for JTAG set state execution. + */ +struct jtag_end_tap_state { + __u8 reset; + __u8 endstate; + __u8 tck; +}; + +/** + * struct jtag_xfer - jtag xfer: + * + * @type: transfer type + * @direction: xfer direction + * @length: xfer bits len + * @tdio : xfer data array + * @endir: xfer end state + * + * Structure provide interface to JTAG device for JTAG SDR/SIR xfer execution. + */ +struct jtag_xfer { + __u8 type; + __u8 direction; + __u8 endstate; + __u8 padding; + __u32 length; + __u64 tdio; +}; + +/** + * struct jtag_bitbang - jtag bitbang: + * + * @tms: JTAG TMS + * @tdi: JTAG TDI (input) + * @tdo: JTAG TDO (output) + * + * Structure provide interface to JTAG device for JTAG bitbang execution. + */ +struct tck_bitbang { + __u8 tms; + __u8 tdi; + __u8 tdo; +} __attribute__((__packed__)); + +/** + * struct jtag_mode - jtag mode: + * + * @feature: 0 - JTAG feature setting selector for JTAG controller HW/SW + * 1 - JTAG feature setting selector for controller + * bus(master/slave) mode. + * @mode: (0 - SW / 1 - HW) for JTAG_XFER_MODE feature(0) + * (0 - Slave / 1 - Master) for JTAG_CONTROL_MODE feature(1) + * + * Structure provide configuration modes to JTAG device. + */ +struct jtag_mode { + __u32 feature; + __u32 mode; +}; + +/* ioctl interface */ +#define __JTAG_IOCTL_MAGIC 0xb2 + +#define JTAG_SIOCSTATE _IOW(__JTAG_IOCTL_MAGIC, 0, struct jtag_end_tap_state) +#define JTAG_SIOCFREQ _IOW(__JTAG_IOCTL_MAGIC, 1, unsigned int) +#define JTAG_GIOCFREQ _IOR(__JTAG_IOCTL_MAGIC, 2, unsigned int) +#define JTAG_IOCXFER _IOWR(__JTAG_IOCTL_MAGIC, 3, struct jtag_xfer) +#define JTAG_GIOCSTATUS _IOWR(__JTAG_IOCTL_MAGIC, 4, enum jtag_endstate) +#define JTAG_SIOCMODE _IOW(__JTAG_IOCTL_MAGIC, 5, unsigned int) +#define JTAG_IOCBITBANG _IOW(__JTAG_IOCTL_MAGIC, 6, unsigned int) + +#endif /* __UAPI_LINUX_JTAG_H */ -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v29 1/6] drivers: jtag: Add JTAG core driver 2020-04-13 22:29 ` [PATCH v29 1/6] drivers: jtag: Add JTAG core driver Ernesto Corona @ 2021-01-15 11:18 ` Paul Fertser 0 siblings, 0 replies; 17+ messages in thread From: Paul Fertser @ 2021-01-15 11:18 UTC (permalink / raw) To: Ernesto Corona Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed, Viresh Kumar, Linus Walleij, Palmer Dabbelt, Amithash Prasad, Rgrs, Christian Gromm, Yiwei Zhang, Joel Stanley, Steven Filary, Alessandro Rubini, Kees Cook, Arnd Bergmann, Johan Hovold, William Breathitt Gray, Jiri Pirko, Jonathan Cameron, Mika Westerberg, Jens Axboe, Tony Luck, Boris Brezillon, Greg Kroah-Hartman, Randy Dunlap, Patrick Williams, Federico Vaga, Oleksandr Shamray, Vadim Pasternak On Mon, Apr 13, 2020 at 03:29:15PM -0700, Ernesto Corona wrote: > --- /dev/null > +++ b/drivers/jtag/jtag.c > + case JTAG_SIOCFREQ: > + if (!jtag->ops->freq_set) > + return -EOPNOTSUPP; > + > + if (get_user(value, (__u32 __user *)arg)) > + return -EFAULT; Does this need to be a pointer to a variable even if it's just a number? > + case JTAG_IOCXFER: > + if (copy_from_user(&xfer, (const void __user *)arg, > + sizeof(struct jtag_xfer))) > + return -EFAULT; > + > + if (xfer.length >= JTAG_MAX_XFER_DATA_LEN) > + return -EINVAL; > + > + if (xfer.type > JTAG_SDR_XFER) > + return -EINVAL; > + > + if (xfer.direction > JTAG_READ_WRITE_XFER) > + return -EINVAL; > + > + if (xfer.endstate > JTAG_STATE_UPDATEIR) > + return -EINVAL; > + > + data_size = DIV_ROUND_UP(xfer.length, BITS_PER_BYTE); > + xfer_data = memdup_user(u64_to_user_ptr(xfer.tdio), data_size); So this might copy more bits than the user specified, but that's probably OK. > + if (IS_ERR(xfer_data)) > + return -EFAULT; > + > + err = jtag->ops->xfer(jtag, &xfer, xfer_data); > + if (err) { > + kfree(xfer_data); > + return err; > + } > + > + err = copy_to_user(u64_to_user_ptr(xfer.tdio), > + (void *)xfer_data, data_size); And this might overwrite some bits and it's not OK, at least not without a warning in the documentation. > --- /dev/null > +++ b/include/uapi/linux/jtag.h > @@ -0,0 +1,194 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +// include/uapi/linux/jtag.h - JTAG class driver uapi > +// > +// Copyright (c) 2018 Mellanox Technologies. All rights reserved. > +// Copyright (c) 2018 Oleksandr Shamray <oleksandrs@mellanox.com> > + > +#ifndef __UAPI_LINUX_JTAG_H > +#define __UAPI_LINUX_JTAG_H > + Missing <linux/types.h> Other API comments will be sent as a reply to the "Documentation: jtag: Add ABI documentation" patch as they are not implementation-specific. -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v29 2/6] dt-binding: jtag: Aspeed 2400 and 2500 series 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 1/6] drivers: jtag: Add JTAG core driver Ernesto Corona @ 2020-04-13 22:29 ` Ernesto Corona 2021-01-19 12:04 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver Ernesto Corona ` (4 subsequent siblings) 6 siblings, 1 reply; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Cc: Ernesto Corona, Oleksandr Shamray, Jiri Pirko, Jonathan Corbet, Mauro Carvalho Chehab, Alexandre Belloni, Theodore Ts'o, Arnd Bergmann, Eric Biggers, Mark Rutland, Joel Stanley, Andrew Jeffery, Steven Filary, Vadim Pasternak, Amithash Prasad, Patrick Williams, Rgrs Aspeed AST2400 and AST2500 JTAG master controller driver. Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> Acked-by: Rob Herring <robh@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Eric Biggers <ebiggers@google.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Joel Stanley <joel@jms.id.au> Cc: Andrew Jeffery <andrew@aj.id.au> Cc: Steven Filary <steven.a.filary@intel.com> Cc: Vadim Pasternak <vadimp@mellanox.com> Cc: Amithash Prasad <amithash@fb.com> Cc: Patrick Williams <patrickw3@fb.com> Cc: Rgrs <rgrs@protonmail.com> --- v28->v29 - Change documentation to the new dt-bindings yaml format. v27->v28 v26->v27 v25->v26 v24->v25 v23->v24 v22->v23 v21->v22 v20->v21 v19->v20 v18->v19 v17->v18 v16->v17 v15->v16 Comments pointed by Joel Stanley <joel.stan@gmail.com> - change clocks = <&clk_apb> to proper clocks = <&syscon ASPEED_CLK_APB> - add reset descriptions in bndings file v14->v15 v13->v14 v12->v13 v11->v12 v10->v11 v9->v10 v8->v9 v7->v8 Comments pointed by pointed by Joel Stanley <joel.stan@gmail.com> - Change compatible string to ast2400 and ast2000 V6->v7 Comments pointed by Tobias Klauser <tklauser@distanz.ch> - Fix spell "Doccumentation" -> "Documentation" v5->v6 Comments pointed by Tobias Klauser <tklauser@distanz.ch> - Small nit: s/documentation/Documentation/ v4->v5 V3->v4 Comments pointed by Rob Herring <robh@kernel.org> - delete unnecessary "status" and "reg-shift" descriptions in bndings file v2->v3 Comments pointed by Rob Herring <robh@kernel.org> - split Aspeed jtag driver and binding to sepatrate patches - delete unnecessary "status" and "reg-shift" descriptions in bindings file --- .../devicetree/bindings/jtag/aspeed-jtag.yaml | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 Documentation/devicetree/bindings/jtag/aspeed-jtag.yaml diff --git a/Documentation/devicetree/bindings/jtag/aspeed-jtag.yaml b/Documentation/devicetree/bindings/jtag/aspeed-jtag.yaml new file mode 100644 index 000000000000..cdcd872c38c9 --- /dev/null +++ b/Documentation/devicetree/bindings/jtag/aspeed-jtag.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/jtag/aspeed-jtag.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aspeed JTAG driver for ast2400 and ast2500 SoC + +description: + Driver adds support of Aspeed 2500/2400 series SOC JTAG master controller. + Driver implements the following jtag ops + freq_get + freq_set + status_get + status_set + xfer + mode_set + bitbang + enable + disable + + It has been tested on Mellanox system with BMC equipped with + Aspeed 2520 SoC for programming CPLD devices. + + It has also been tested on Intel system using Aspeed 25xx SoC + for JTAG communication. + +maintainers: + - Oleksandr Shamray <oleksandrs@mellanox.com> + - Jiri Pirko <jiri@mellanox.com> + - Ernesto Corona<ernesto.corona@intel.com> + +properties: + compatible: + oneOf: + - items: + - enum: + - aspeed,ast2400-jtag + - aspeed,ast2500-jtag + + + reg: + items: + - description: JTAG Master controller register range + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - clocks + +examples: + - | + #include <dt-bindings/clock/aspeed-clock.h> + #include <dt-bindings/interrupt-controller/irq.h> + + jtag: jtag@1e6e4000 { + compatible = "aspeed,ast2500-jtag"; + reg = <0x1e6e4000 0x1c>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_JTAG_MASTER>; + interrupts = <43>; + }; + +... -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v29 2/6] dt-binding: jtag: Aspeed 2400 and 2500 series 2020-04-13 22:29 ` [PATCH v29 2/6] dt-binding: jtag: Aspeed 2400 and 2500 series Ernesto Corona @ 2021-01-19 12:04 ` Paul Fertser 0 siblings, 0 replies; 17+ messages in thread From: Paul Fertser @ 2021-01-19 12:04 UTC (permalink / raw) To: Ernesto Corona Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed, Mark Rutland, Alexandre Belloni, Theodore Ts'o, Arnd Bergmann, Jonathan Corbet, Andrew Jeffery, Steven Filary, Eric Biggers, Amithash Prasad, Jiri Pirko, Rgrs, Joel Stanley, Mauro Carvalho Chehab, Patrick Williams, Oleksandr Shamray, Vadim Pasternak On Mon, Apr 13, 2020 at 03:29:16PM -0700, Ernesto Corona wrote: > --- /dev/null > +++ b/Documentation/devicetree/bindings/jtag/aspeed-jtag.yaml > +examples: > + - | > + #include <dt-bindings/clock/aspeed-clock.h> > + #include <dt-bindings/interrupt-controller/irq.h> > + > + jtag: jtag@1e6e4000 { > + compatible = "aspeed,ast2500-jtag"; > + reg = <0x1e6e4000 0x1c>; > + clocks = <&syscon ASPEED_CLK_APB>; > + resets = <&syscon ASPEED_RESET_JTAG_MASTER>; > + interrupts = <43>; > + }; It's nice to have an example but shouldn't it also be included in aspeed-g5.dtsi as part of the patch series if it's known that the driver works on those SoCs and the peripheral is always present? -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 1/6] drivers: jtag: Add JTAG core driver Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 2/6] dt-binding: jtag: Aspeed 2400 and 2500 series Ernesto Corona @ 2020-04-13 22:29 ` Ernesto Corona 2020-09-28 2:17 ` Moritz Fischer 2021-01-15 11:53 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 4/6] Documentation: jtag: Add ABI documentation Ernesto Corona ` (3 subsequent siblings) 6 siblings, 2 replies; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Cc: Ernesto Corona, Oleksandr Shamray, Jiri Pirko, Joel Stanley, Andrew Jeffery, Philipp Zabel, Steven Filary, Vadim Pasternak, Amithash Prasad, Patrick Williams, Rgrs Driver adds support of Aspeed 2500/2400 series SOC JTAG master controller. Driver implements the following jtag ops: - freq_get; - freq_set; - status_get; - status_set - xfer; - mode_set; - bitbang; - enable; - disable; It has been tested on Mellanox system with BMC equipped with Aspeed 2520 SoC for programming CPLD devices. It has also been tested on Intel system using Aspeed 25xx SoC for JTAG communication. Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Philippe Ombredanne <pombredanne@nexb.com> Acked-by: Joel Stanley <joel@jms.id.au> Cc: Joel Stanley <joel@jms.id.au> Cc: Andrew Jeffery <andrew@aj.id.au> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Steven Filary <steven.a.filary@intel.com> Cc: Vadim Pasternak <vadimp@mellanox.com> Cc: Amithash Prasad <amithash@fb.com> Cc: Patrick Williams <patrickw3@fb.com> Cc: Rgrs <rgrs@protonmail.com> --- v28->v29 v27->v28 Comments pointed by Steven Filary <steven.a.filary@intel.com> - Replace JTAG_IOCRUNTEST with JTAG_SIOCSTATE adding support for all TAPC end states in SW mode using a lookup table to navigate across states. - Add support for simultaneous READ/WRITE transfers(JTAG_READ_WRITE_XFER). - Support for switching JTAG controller mode between slave and master mode. - Setup JTAG controller mode to master only when the driver is opened, letting other HW to own the JTAG bus when it isn't in use. - Include JTAG bit bang IOCTL for low level JTAG control usage (JTAG_IOCBITBANG). - Add debug traces. - Add support for register polling (default) due it is 3 times faster than interrupt mode. Define USE_INTERRUPTS macro to enable interrupt usage. - Remove unnecessary delays for aspeed_jtag_status_set function. It makes SW mode 4 times faster. - Clean data buffer on aspeed_jtag_xfer_sw before tdo writes to avoid data output corruption for read operations in SW mode. - Correct register settings for HW mode transfer operations. - Propagate ret codes all the way from low level functions up to JTAG_IOCXFER call. - Support for partitioned transfers. Single JTAG transfer through multiples JTAG_IOCXFER calls. Now end transmission(scan_end) also evaluates transfer end state. v26->v27 Changes made by Oleksandr Shamray <oleksandrs@mellamnox.com> - change aspeed_jtag_sw_delay to udelay function in bit-bang operation v25->v26 v24->v25 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - reduced debug printouts v23->v24 v22->v23 v21->v22 Comments pointed by Andy Shevchenko <andy.shevchenko@gmail.com> - rearrange ASPEED register defines - simplified JTAG divider calculation formula - change delay function in bit-bang operation - add helper functions for TAP states switching - remove unnecessary comments - remove redundant debug messages - make dines for repetative register bit sets - fixed indentation - change checks from negative to positive - add error check for clk_prepare_enable - rework driver alloc/register to devm_ variant - Increasing line length up to 85 in order to improve readability v20->v21 v19->v20 Notifications from kbuild test robot <lkp@intel.com> - add static declaration to 'aspeed_jtag_init' and 'aspeed_jtag_deinit' functions v18->v19 v17->v18 v16->v17 v15->v16 Comments pointed by Joel Stanley <joel.stan@gmail.com> - Add reset_control on Jtag init/deinit v14->v15 Comments pointed by Joel Stanley <joel.stan@gmail.com> - Add ARCH_ASPEED || COMPILE_TEST to Kconfig - remove unused offset variable - remove "aspeed_jtag" from dev_err and dev_dbg messages - change clk_prepare_enable initialisation order v13->v14 Comments pointed by Philippe Ombredanne <pombredanne@nexb.com> - Change style of head block comment from /**/ to // v12->v13 Comments pointed by Philippe Ombredanne <pombredanne@nexb.com> - Change jtag-aspeed.c licence type to SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note and reorder line with license- add reset descriptions in bndings file in description Comments pointed by Kun Yi <kunyi@google.com> - Changed capability check for aspeed,ast2400-jtag/ast200-jtag v11->v12 Comments pointed by Chip Bilbrey <chip@bilbrey.org> - Remove access mode from xfer and idle transactions - Add new ioctl JTAG_SIOCMODE for set hw mode v10->v11 v9->v10 V8->v9 Comments pointed by Arnd Bergmann <arnd@arndb.de> - add *data parameter to xfer function prototype v7->v8 Comments pointed by Joel Stanley <joel.stan@gmail.com> - aspeed_jtag_init replace goto to return; - change input variables type from __u32 to u32 in functios freq_get, freq_set, status_get - change sm_ variables type from char to u8 - in jatg_init add disable clocks on error case - remove release_mem_region on error case - remove devm_free_irq on jtag_deinit - Fix misspelling Disabe/Disable - Change compatible string to ast2400 and ast2000 v6->v7 Notifications from kbuild test robot <lkp@intel.com> - Add include <linux/types.h> to jtag-asapeed.c v5->v6 v4->v5 Comments pointed by Arnd Bergmann <arnd@arndb.de> - Added HAS_IOMEM dependence in Kconfig to avoid "undefined reference to `devm_ioremap_resource'" error, because in some arch this not supported v3->v4 Comments pointed by Arnd Bergmann <arnd@arndb.de> - change transaction pointer tdio type to __u64 - change internal status type from enum to __u32 v2->v3 v1->v2 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - change license type from GPLv2/BSD to GPLv2 --- drivers/jtag/Kconfig | 14 + drivers/jtag/Makefile | 1 + drivers/jtag/jtag-aspeed.c | 1027 ++++++++++++++++++++++++++++++++++++ 3 files changed, 1042 insertions(+) create mode 100644 drivers/jtag/jtag-aspeed.c diff --git a/drivers/jtag/Kconfig b/drivers/jtag/Kconfig index 47771fcd3c5b..0cc163f9ad44 100644 --- a/drivers/jtag/Kconfig +++ b/drivers/jtag/Kconfig @@ -15,3 +15,17 @@ menuconfig JTAG To compile this driver as a module, choose M here: the module will be called jtag. + +menuconfig JTAG_ASPEED + tristate "Aspeed SoC JTAG controller support" + depends on JTAG && HAS_IOMEM + depends on ARCH_ASPEED || COMPILE_TEST + help + This provides a support for Aspeed JTAG device, equipped on + Aspeed SoC 24xx and 25xx families. Drivers allows programming + of hardware devices, connected to SoC through the JTAG interface. + + If you want this support, you should say Y here. + + To compile this driver as a module, choose M here: the module will + be called jtag-aspeed. diff --git a/drivers/jtag/Makefile b/drivers/jtag/Makefile index af374939a9e6..04a855e2df28 100644 --- a/drivers/jtag/Makefile +++ b/drivers/jtag/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_JTAG) += jtag.o +obj-$(CONFIG_JTAG_ASPEED) += jtag-aspeed.o diff --git a/drivers/jtag/jtag-aspeed.c b/drivers/jtag/jtag-aspeed.c new file mode 100644 index 000000000000..254548762dc5 --- /dev/null +++ b/drivers/jtag/jtag-aspeed.c @@ -0,0 +1,1027 @@ +// SPDX-License-Identifier: GPL-2.0 +// drivers/jtag/aspeed-jtag.c +// +// Copyright (c) 2018 Mellanox Technologies. All rights reserved. +// Copyright (c) 2018 Oleksandr Shamray <oleksandrs@mellanox.com> + +#include <linux/clk.h> +#include <linux/device.h> +#include <linux/interrupt.h> +#include <linux/jtag.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/slab.h> +#include <linux/types.h> +#include <linux/delay.h> +#include <uapi/linux/jtag.h> + +#define ASPEED_SCU_RESET_JTAG BIT(22) + +#define ASPEED_JTAG_DATA 0x00 +#define ASPEED_JTAG_INST 0x04 +#define ASPEED_JTAG_CTRL 0x08 +#define ASPEED_JTAG_ISR 0x0C +#define ASPEED_JTAG_SW 0x10 +#define ASPEED_JTAG_TCK 0x14 +#define ASPEED_JTAG_EC 0x18 + +#define ASPEED_JTAG_DATA_MSB 0x01 +#define ASPEED_JTAG_DATA_CHUNK_SIZE 0x20 + +/* ASPEED_JTAG_CTRL: Engine Control */ +#define ASPEED_JTAG_CTL_ENG_EN BIT(31) +#define ASPEED_JTAG_CTL_ENG_OUT_EN BIT(30) +#define ASPEED_JTAG_CTL_FORCE_TMS BIT(29) +#define ASPEED_JTAG_CTL_IR_UPDATE BIT(26) +#define ASPEED_JTAG_CTL_INST_LEN(x) ((x) << 20) +#define ASPEED_JTAG_CTL_LASPEED_INST BIT(17) +#define ASPEED_JTAG_CTL_INST_EN BIT(16) +#define ASPEED_JTAG_CTL_DR_UPDATE BIT(10) +#define ASPEED_JTAG_CTL_DATA_LEN(x) ((x) << 4) +#define ASPEED_JTAG_CTL_LASPEED_DATA BIT(1) +#define ASPEED_JTAG_CTL_DATA_EN BIT(0) + +/* ASPEED_JTAG_ISR : Interrupt status and enable */ +#define ASPEED_JTAG_ISR_INST_PAUSE BIT(19) +#define ASPEED_JTAG_ISR_INST_COMPLETE BIT(18) +#define ASPEED_JTAG_ISR_DATA_PAUSE BIT(17) +#define ASPEED_JTAG_ISR_DATA_COMPLETE BIT(16) +#define ASPEED_JTAG_ISR_INST_PAUSE_EN BIT(3) +#define ASPEED_JTAG_ISR_INST_COMPLETE_EN BIT(2) +#define ASPEED_JTAG_ISR_DATA_PAUSE_EN BIT(1) +#define ASPEED_JTAG_ISR_DATA_COMPLETE_EN BIT(0) +#define ASPEED_JTAG_ISR_INT_EN_MASK GENMASK(3, 0) +#define ASPEED_JTAG_ISR_INT_MASK GENMASK(19, 16) + +/* ASPEED_JTAG_SW : Software Mode and Status */ +#define ASPEED_JTAG_SW_MODE_EN BIT(19) +#define ASPEED_JTAG_SW_MODE_TCK BIT(18) +#define ASPEED_JTAG_SW_MODE_TMS BIT(17) +#define ASPEED_JTAG_SW_MODE_TDIO BIT(16) + +/* ASPEED_JTAG_TCK : TCK Control */ +#define ASPEED_JTAG_TCK_DIVISOR_MASK GENMASK(10, 0) +#define ASPEED_JTAG_TCK_GET_DIV(x) ((x) & ASPEED_JTAG_TCK_DIVISOR_MASK) + +/* ASPEED_JTAG_EC : Controller set for go to IDLE */ +#define ASPEED_JTAG_EC_GO_IDLE BIT(0) + +#define ASPEED_JTAG_IOUT_LEN(len) \ + (ASPEED_JTAG_CTL_ENG_EN | \ + ASPEED_JTAG_CTL_ENG_OUT_EN | \ + ASPEED_JTAG_CTL_INST_LEN(len)) + +#define ASPEED_JTAG_DOUT_LEN(len) \ + (ASPEED_JTAG_CTL_ENG_EN | \ + ASPEED_JTAG_CTL_ENG_OUT_EN | \ + ASPEED_JTAG_CTL_DATA_LEN(len)) + +#define ASPEED_JTAG_SW_TDIO (ASPEED_JTAG_SW_MODE_EN | ASPEED_JTAG_SW_MODE_TDIO) + +#define ASPEED_JTAG_GET_TDI(direction, byte) \ + (((direction) & JTAG_WRITE_XFER) ? byte : UINT_MAX) + +#define ASPEED_JTAG_TCK_WAIT 10 +#define ASPEED_JTAG_RESET_CNTR 10 +#define WAIT_ITERATIONS 75 + +/*#define USE_INTERRUPTS*/ + +static const char * const regnames[] = { + [ASPEED_JTAG_DATA] = "ASPEED_JTAG_DATA", + [ASPEED_JTAG_INST] = "ASPEED_JTAG_INST", + [ASPEED_JTAG_CTRL] = "ASPEED_JTAG_CTRL", + [ASPEED_JTAG_ISR] = "ASPEED_JTAG_ISR", + [ASPEED_JTAG_SW] = "ASPEED_JTAG_SW", + [ASPEED_JTAG_TCK] = "ASPEED_JTAG_TCK", + [ASPEED_JTAG_EC] = "ASPEED_JTAG_EC", +}; + +#define ASPEED_JTAG_NAME "jtag-aspeed" + +struct aspeed_jtag { + void __iomem *reg_base; + void __iomem *scu_base; + struct device *dev; + struct clk *pclk; + enum jtag_endstate status; + int irq; + struct reset_control *rst; + u32 flag; + wait_queue_head_t jtag_wq; + u32 mode; +}; + +/* + * This structure represents a TMS cycle, as expressed in a set of bits and a + * count of bits (note: there are no start->end state transitions that require + * more than 1 byte of TMS cycles) + */ +struct tms_cycle { + unsigned char tmsbits; + unsigned char count; +}; + +/* + * This is the complete set TMS cycles for going from any TAP state to any + * other TAP state, following a "shortest path" rule. + */ +static const struct tms_cycle _tms_cycle_lookup[][16] = { +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* TLR */{{0x00, 0}, {0x00, 1}, {0x02, 2}, {0x02, 3}, {0x02, 4}, {0x0a, 4}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x0a, 5}, {0x2a, 6}, {0x1a, 5}, {0x06, 3}, {0x06, 4}, {0x06, 5}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x16, 5}, {0x16, 6}, {0x56, 7}, {0x36, 6} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* RTI */{{0x07, 3}, {0x00, 0}, {0x01, 1}, {0x01, 2}, {0x01, 3}, {0x05, 3}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x05, 4}, {0x15, 5}, {0x0d, 4}, {0x03, 2}, {0x03, 3}, {0x03, 4}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x0b, 4}, {0x0b, 5}, {0x2b, 6}, {0x1b, 5} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* SelDR*/{{0x03, 2}, {0x03, 3}, {0x00, 0}, {0x00, 1}, {0x00, 2}, {0x02, 2}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x02, 3}, {0x0a, 4}, {0x06, 3}, {0x01, 1}, {0x01, 2}, {0x01, 3}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x05, 3}, {0x05, 4}, {0x15, 5}, {0x0d, 4} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* CapDR*/{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x00, 0}, {0x00, 1}, {0x01, 1}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x01, 2}, {0x05, 3}, {0x03, 2}, {0x0f, 4}, {0x0f, 5}, {0x0f, 6}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x2f, 6}, {0x2f, 7}, {0xaf, 8}, {0x6f, 7} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* SDR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x00, 0}, {0x01, 1}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x01, 2}, {0x05, 3}, {0x03, 2}, {0x0f, 4}, {0x0f, 5}, {0x0f, 6}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x2f, 6}, {0x2f, 7}, {0xaf, 8}, {0x6f, 7} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* Ex1DR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x02, 3}, {0x00, 0}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x00, 1}, {0x02, 2}, {0x01, 1}, {0x07, 3}, {0x07, 4}, {0x07, 5}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x17, 5}, {0x17, 6}, {0x57, 7}, {0x37, 6} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* PDR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x01, 2}, {0x05, 3}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x00, 0}, {0x01, 1}, {0x03, 2}, {0x0f, 4}, {0x0f, 5}, {0x0f, 6}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x2f, 6}, {0x2f, 7}, {0xaf, 8}, {0x6f, 7} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* Ex2DR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x00, 1}, {0x02, 2}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x02, 3}, {0x00, 0}, {0x01, 1}, {0x07, 3}, {0x07, 4}, {0x07, 5}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x17, 5}, {0x17, 6}, {0x57, 7}, {0x37, 6} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* UpdDR*/{{0x07, 3}, {0x00, 1}, {0x01, 1}, {0x01, 2}, {0x01, 3}, {0x05, 3}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x05, 4}, {0x15, 5}, {0x00, 0}, {0x03, 2}, {0x03, 3}, {0x03, 4}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x0b, 4}, {0x0b, 5}, {0x2b, 6}, {0x1b, 5} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* SelIR*/{{0x01, 1}, {0x01, 2}, {0x05, 3}, {0x05, 4}, {0x05, 5}, {0x15, 5}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x15, 6}, {0x55, 7}, {0x35, 6}, {0x00, 0}, {0x00, 1}, {0x00, 2}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x02, 2}, {0x02, 3}, {0x0a, 4}, {0x06, 3} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* CapIR*/{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x07, 5}, {0x17, 5}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x17, 6}, {0x57, 7}, {0x37, 6}, {0x0f, 4}, {0x00, 0}, {0x00, 1}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x01, 1}, {0x01, 2}, {0x05, 3}, {0x03, 2} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* SIR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x07, 5}, {0x17, 5}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x17, 6}, {0x57, 7}, {0x37, 6}, {0x0f, 4}, {0x0f, 5}, {0x00, 0}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x01, 1}, {0x01, 2}, {0x05, 3}, {0x03, 2} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* Ex1IR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x03, 4}, {0x0b, 4}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x0b, 5}, {0x2b, 6}, {0x1b, 5}, {0x07, 3}, {0x07, 4}, {0x02, 3}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x00, 0}, {0x00, 1}, {0x02, 2}, {0x01, 1} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* PIR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x07, 5}, {0x17, 5}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x17, 6}, {0x57, 7}, {0x37, 6}, {0x0f, 4}, {0x0f, 5}, {0x01, 2}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x05, 3}, {0x00, 0}, {0x01, 1}, {0x03, 2} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* Ex2IR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x03, 4}, {0x0b, 4}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x0b, 5}, {0x2b, 6}, {0x1b, 5}, {0x07, 3}, {0x07, 4}, {0x00, 1}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x02, 2}, {0x02, 3}, {0x00, 0}, {0x01, 1} }, + +/* TLR RTI SelDR CapDR SDR Ex1DR*/ +/* UpdIR*/{{0x07, 3}, {0x00, 1}, {0x01, 1}, {0x01, 2}, {0x01, 3}, {0x05, 3}, +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ + {0x05, 4}, {0x15, 5}, {0x0d, 4}, {0x03, 2}, {0x03, 3}, {0x03, 4}, +/* Ex1IR PIR Ex2IR UpdIR*/ + {0x0b, 4}, {0x0b, 5}, {0x2b, 6}, {0x00, 0} }, +}; + +static char *end_status_str[] = { + "tlr", "idle", "selDR", "capDR", "sDR", "ex1DR", "pDR", "ex2DR", + "updDR", "selIR", "capIR", "sIR", "ex1IR", "pIR", "ex2IR", "updIR" +}; + +static u32 aspeed_jtag_read(struct aspeed_jtag *aspeed_jtag, u32 reg) +{ + u32 val = readl(aspeed_jtag->reg_base + reg); + + dev_dbg(aspeed_jtag->dev, "read:%s val = 0x%08x\n", regnames[reg], val); + return val; +} + +static void +aspeed_jtag_write(struct aspeed_jtag *aspeed_jtag, u32 val, u32 reg) +{ + dev_dbg(aspeed_jtag->dev, "write:%s val = 0x%08x\n", + regnames[reg], val); + writel(val, aspeed_jtag->reg_base + reg); +} + +static int aspeed_jtag_freq_set(struct jtag *jtag, u32 freq) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + unsigned long apb_frq; + u32 tck_val; + u16 div; + + apb_frq = clk_get_rate(aspeed_jtag->pclk); + if (!apb_frq) + return -ENOTSUPP; + + div = (apb_frq - 1) / freq; + tck_val = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_TCK); + aspeed_jtag_write(aspeed_jtag, + (tck_val & ~ASPEED_JTAG_TCK_DIVISOR_MASK) | div, + ASPEED_JTAG_TCK); + return 0; +} + +static int aspeed_jtag_freq_get(struct jtag *jtag, u32 *frq) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + u32 pclk; + u32 tck; + + pclk = clk_get_rate(aspeed_jtag->pclk); + tck = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_TCK); + *frq = pclk / (ASPEED_JTAG_TCK_GET_DIV(tck) + 1); + + return 0; +} + +static inline void aspeed_jtag_slave(struct aspeed_jtag *aspeed_jtag) +{ + u32 scu_reg = readl(aspeed_jtag->scu_base); + + writel(scu_reg | ASPEED_SCU_RESET_JTAG, aspeed_jtag->scu_base); +} + +static inline void aspeed_jtag_master(struct aspeed_jtag *aspeed_jtag) +{ + u32 scu_reg = readl(aspeed_jtag->scu_base); + + writel(scu_reg & ~ASPEED_SCU_RESET_JTAG, aspeed_jtag->scu_base); + + aspeed_jtag_write(aspeed_jtag, (ASPEED_JTAG_CTL_ENG_EN | + ASPEED_JTAG_CTL_ENG_OUT_EN), + ASPEED_JTAG_CTRL); + + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_MODE_EN | + ASPEED_JTAG_SW_MODE_TDIO, + ASPEED_JTAG_SW); + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_INST_PAUSE | + ASPEED_JTAG_ISR_INST_COMPLETE | + ASPEED_JTAG_ISR_DATA_PAUSE | + ASPEED_JTAG_ISR_DATA_COMPLETE | + ASPEED_JTAG_ISR_INST_PAUSE_EN | + ASPEED_JTAG_ISR_INST_COMPLETE_EN | + ASPEED_JTAG_ISR_DATA_PAUSE_EN | + ASPEED_JTAG_ISR_DATA_COMPLETE_EN, + ASPEED_JTAG_ISR); /* Enable Interrupt */ +} + +static int aspeed_jtag_mode_set(struct jtag *jtag, struct jtag_mode *jtag_mode) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + switch (jtag_mode->feature) { + case JTAG_XFER_MODE: + aspeed_jtag->mode = jtag_mode->mode; + break; + case JTAG_CONTROL_MODE: + if (jtag_mode->mode == JTAG_SLAVE_MODE) + aspeed_jtag_slave(aspeed_jtag); + else if (jtag_mode->mode == JTAG_MASTER_MODE) + aspeed_jtag_master(aspeed_jtag); + break; + default: + return -EINVAL; + } + return 0; +} + +static char aspeed_jtag_tck_cycle(struct aspeed_jtag *aspeed_jtag, + u8 tms, u8 tdi) +{ + char tdo = 0; + + /* TCK = 0 */ + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_MODE_EN | + (tms * ASPEED_JTAG_SW_MODE_TMS) | + (tdi * ASPEED_JTAG_SW_MODE_TDIO), ASPEED_JTAG_SW); + + aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_SW); + + /* TCK = 1 */ + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_MODE_EN | + ASPEED_JTAG_SW_MODE_TCK | + (tms * ASPEED_JTAG_SW_MODE_TMS) | + (tdi * ASPEED_JTAG_SW_MODE_TDIO), ASPEED_JTAG_SW); + + if (aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_SW) & + ASPEED_JTAG_SW_MODE_TDIO) + tdo = 1; + + return tdo; +} + +static int aspeed_jtag_bitbang(struct jtag *jtag, + struct tck_bitbang *tck_bitbang) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + tck_bitbang->tdo = aspeed_jtag_tck_cycle(aspeed_jtag, + tck_bitbang->tms, + tck_bitbang->tdi); + return 0; +} + +static int aspeed_jtag_wait_instruction_pause(struct aspeed_jtag *aspeed_jtag) +{ + int res = 0; +#ifdef USE_INTERRUPTS + res = wait_event_interruptible(aspeed_jtag->jtag_wq, + aspeed_jtag->flag & + ASPEED_JTAG_ISR_INST_PAUSE); + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_INST_PAUSE; +#else + u32 status = 0; + u32 iterations = 0; + + while ((status & ASPEED_JTAG_ISR_INST_PAUSE) == 0) { + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); + iterations++; + if (iterations > WAIT_ITERATIONS) { + dev_err(aspeed_jtag->dev, + "aspeed_jtag driver timed out waiting for instruction pause complete\n"); + res = -EFAULT; + break; + } + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { + if (iterations % 25 == 0) + usleep_range(1, 5); + else + udelay(1); + } + } + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_INST_PAUSE | + (status & 0xf), + ASPEED_JTAG_ISR); +#endif + return res; +} + +static int +aspeed_jtag_wait_instruction_complete(struct aspeed_jtag *aspeed_jtag) +{ + int res = 0; +#ifdef USE_INTERRUPTS + res = wait_event_interruptible(aspeed_jtag->jtag_wq, + aspeed_jtag->flag & + ASPEED_JTAG_ISR_INST_COMPLETE); + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_INST_COMPLETE; +#else + u32 status = 0; + u32 iterations = 0; + + while ((status & ASPEED_JTAG_ISR_INST_COMPLETE) == 0) { + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); + iterations++; + if (iterations > WAIT_ITERATIONS) { + dev_err(aspeed_jtag->dev, + "aspeed_jtag driver timed out waiting for instruction complete\n"); + res = -EFAULT; + break; + } + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { + if (iterations % 25 == 0) + usleep_range(1, 5); + else + udelay(1); + } + } + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_INST_COMPLETE | + (status & 0xf), + ASPEED_JTAG_ISR); +#endif + return res; +} + +static int +aspeed_jtag_wait_data_pause_complete(struct aspeed_jtag *aspeed_jtag) +{ + int res = 0; +#ifdef USE_INTERRUPTS + res = wait_event_interruptible(aspeed_jtag->jtag_wq, + aspeed_jtag->flag & + ASPEED_JTAG_ISR_DATA_PAUSE); + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_DATA_PAUSE; +#else + u32 status = 0; + u32 iterations = 0; + + while ((status & ASPEED_JTAG_ISR_DATA_PAUSE) == 0) { + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); + iterations++; + if (iterations > WAIT_ITERATIONS) { + dev_err(aspeed_jtag->dev, + "aspeed_jtag driver timed out waiting for data pause complete\n"); + res = -EFAULT; + break; + } + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { + if (iterations % 25 == 0) + usleep_range(1, 5); + else + udelay(1); + } + } + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_DATA_PAUSE | + (status & 0xf), ASPEED_JTAG_ISR); +#endif + return res; +} + +static int aspeed_jtag_wait_data_complete(struct aspeed_jtag *aspeed_jtag) +{ + int res = 0; +#ifdef USE_INTERRUPTS + res = wait_event_interruptible(aspeed_jtag->jtag_wq, + aspeed_jtag->flag & + ASPEED_JTAG_ISR_DATA_COMPLETE); + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_DATA_COMPLETE; +#else + u32 status = 0; + u32 iterations = 0; + + while ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); + iterations++; + if (iterations > WAIT_ITERATIONS) { + dev_err(aspeed_jtag->dev, + "ast_jtag driver timed out waiting for data complete\n"); + res = -EFAULT; + break; + } + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { + if (iterations % 25 == 0) + usleep_range(1, 5); + else + udelay(1); + } + } + aspeed_jtag_write(aspeed_jtag, + ASPEED_JTAG_ISR_DATA_COMPLETE | (status & 0xf), + ASPEED_JTAG_ISR); +#endif + return res; +} + +static void aspeed_jtag_set_tap_state(struct aspeed_jtag *aspeed_jtag, + enum jtag_endstate endstate) +{ + int i = 0; + enum jtag_endstate from, to; + + from = aspeed_jtag->status; + to = endstate; + for (i = 0; i < _tms_cycle_lookup[from][to].count; i++) + aspeed_jtag_tck_cycle(aspeed_jtag, + ((_tms_cycle_lookup[from][to].tmsbits >> i) & 0x1), 0); + aspeed_jtag->status = endstate; +} + +static void aspeed_jtag_end_tap_state_sw(struct aspeed_jtag *aspeed_jtag, + struct jtag_end_tap_state *endstate) +{ + /* SW mode from curent tap state -> to end_state */ + if (endstate->reset) { + int i = 0; + + for (i = 0; i < ASPEED_JTAG_RESET_CNTR; i++) + aspeed_jtag_tck_cycle(aspeed_jtag, 1, 0); + aspeed_jtag->status = JTAG_STATE_TLRESET; + } + + aspeed_jtag_set_tap_state(aspeed_jtag, endstate->endstate); +} + +static int aspeed_jtag_status_set(struct jtag *jtag, + struct jtag_end_tap_state *endstate) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + dev_dbg(aspeed_jtag->dev, "Set TAP state: %s\n", + end_status_str[endstate->endstate]); + + if (!(aspeed_jtag->mode & JTAG_XFER_HW_MODE)) { + aspeed_jtag_end_tap_state_sw(aspeed_jtag, endstate); + return 0; + } + + /* x TMS high + 1 TMS low */ + if (endstate->reset) { + /* Disable sw mode */ + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_SW); + mdelay(1); + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_CTL_ENG_EN | + ASPEED_JTAG_CTL_ENG_OUT_EN | + ASPEED_JTAG_CTL_FORCE_TMS, ASPEED_JTAG_CTRL); + mdelay(1); + aspeed_jtag_write(aspeed_jtag, + ASPEED_JTAG_SW_TDIO, ASPEED_JTAG_SW); + aspeed_jtag->status = JTAG_STATE_TLRESET; + } + + return 0; +} + +static void aspeed_jtag_xfer_sw(struct aspeed_jtag *aspeed_jtag, + struct jtag_xfer *xfer, u32 *data) +{ + unsigned long remain_xfer = xfer->length; + unsigned long shift_bits = 0; + unsigned long index = 0; + unsigned long tdi; + char tdo; + + dev_dbg(aspeed_jtag->dev, "SW JTAG SHIFT %s, length = %d\n", + (xfer->type == JTAG_SIR_XFER) ? "IR" : "DR", xfer->length); + + if (xfer->type == JTAG_SIR_XFER) + aspeed_jtag_set_tap_state(aspeed_jtag, JTAG_STATE_SHIFTIR); + else + aspeed_jtag_set_tap_state(aspeed_jtag, JTAG_STATE_SHIFTDR); + + tdi = ASPEED_JTAG_GET_TDI(xfer->direction, data[index]); + data[index] = 0; + while (remain_xfer > 1) { + tdo = aspeed_jtag_tck_cycle(aspeed_jtag, 0, + tdi & ASPEED_JTAG_DATA_MSB); + data[index] |= tdo << (shift_bits % + ASPEED_JTAG_DATA_CHUNK_SIZE); + tdi >>= 1; + shift_bits++; + remain_xfer--; + + if (shift_bits % ASPEED_JTAG_DATA_CHUNK_SIZE == 0) { + tdo = 0; + index++; + tdi = ASPEED_JTAG_GET_TDI(xfer->direction, data[index]); + data[index] = 0; + } + } + + if ((xfer->endstate == (xfer->type == JTAG_SIR_XFER ? + JTAG_STATE_SHIFTIR : JTAG_STATE_SHIFTDR))) { + /* Stay in Shift IR/DR*/ + tdo = aspeed_jtag_tck_cycle(aspeed_jtag, 0, + tdi & ASPEED_JTAG_DATA_MSB); + data[index] |= tdo << (shift_bits % + ASPEED_JTAG_DATA_CHUNK_SIZE); + } else { + /* Goto end state */ + tdo = aspeed_jtag_tck_cycle(aspeed_jtag, 1, + tdi & ASPEED_JTAG_DATA_MSB); + data[index] |= tdo << (shift_bits % + ASPEED_JTAG_DATA_CHUNK_SIZE); + aspeed_jtag->status = (xfer->type == JTAG_SIR_XFER) ? + JTAG_STATE_EXIT1IR : JTAG_STATE_EXIT1DR; + aspeed_jtag_set_tap_state(aspeed_jtag, xfer->endstate); + } +} + +static int aspeed_jtag_xfer_push_data(struct aspeed_jtag *aspeed_jtag, + enum jtag_xfer_type type, u32 bits_len) +{ + int res = 0; + + if (type == JTAG_SIR_XFER) { + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_IOUT_LEN(bits_len), + ASPEED_JTAG_CTRL); + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_IOUT_LEN(bits_len) | + ASPEED_JTAG_CTL_INST_EN, ASPEED_JTAG_CTRL); + res = aspeed_jtag_wait_instruction_pause(aspeed_jtag); + } else { + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_DOUT_LEN(bits_len), + ASPEED_JTAG_CTRL); + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_DOUT_LEN(bits_len) | + ASPEED_JTAG_CTL_DATA_EN, ASPEED_JTAG_CTRL); + res = aspeed_jtag_wait_data_pause_complete(aspeed_jtag); + } + return res; +} + +static int aspeed_jtag_xfer_push_data_last(struct aspeed_jtag *aspeed_jtag, + enum jtag_xfer_type type, + u32 shift_bits, + enum jtag_endstate endstate) +{ + int res = 0; + + if (type == JTAG_SIR_XFER) { + aspeed_jtag_write(aspeed_jtag, + ASPEED_JTAG_IOUT_LEN(shift_bits) | + ASPEED_JTAG_CTL_LASPEED_INST, + ASPEED_JTAG_CTRL); + aspeed_jtag_write(aspeed_jtag, + ASPEED_JTAG_IOUT_LEN(shift_bits) | + ASPEED_JTAG_CTL_LASPEED_INST | + ASPEED_JTAG_CTL_INST_EN, + ASPEED_JTAG_CTRL); + res = aspeed_jtag_wait_instruction_complete(aspeed_jtag); + } else { + aspeed_jtag_write(aspeed_jtag, + ASPEED_JTAG_DOUT_LEN(shift_bits) | + ASPEED_JTAG_CTL_LASPEED_DATA, + ASPEED_JTAG_CTRL); + aspeed_jtag_write(aspeed_jtag, + ASPEED_JTAG_DOUT_LEN(shift_bits) | + ASPEED_JTAG_CTL_LASPEED_DATA | + ASPEED_JTAG_CTL_DATA_EN, + ASPEED_JTAG_CTRL); + res = aspeed_jtag_wait_data_complete(aspeed_jtag); + } + return res; +} + +static int aspeed_jtag_xfer_hw(struct aspeed_jtag *aspeed_jtag, + struct jtag_xfer *xfer, u32 *data) +{ + unsigned long remain_xfer = xfer->length; + unsigned long index = 0; + char shift_bits; + u32 data_reg; + u32 scan_end; + + dev_dbg(aspeed_jtag->dev, "HW JTAG SHIFT %s, length = %d\n", + (xfer->type == JTAG_SIR_XFER) ? "IR" : "DR", xfer->length); + data_reg = xfer->type == JTAG_SIR_XFER ? + ASPEED_JTAG_INST : ASPEED_JTAG_DATA; + if (xfer->endstate == JTAG_STATE_SHIFTIR || + xfer->endstate == JTAG_STATE_SHIFTDR || + xfer->endstate == JTAG_STATE_PAUSEIR || + xfer->endstate == JTAG_STATE_PAUSEDR) { + scan_end = 0; + } else { + scan_end = 1; + } + + while (remain_xfer) { + if (xfer->direction & JTAG_WRITE_XFER) + aspeed_jtag_write(aspeed_jtag, data[index], data_reg); + else + aspeed_jtag_write(aspeed_jtag, 0, data_reg); + + if (remain_xfer > ASPEED_JTAG_DATA_CHUNK_SIZE) { + dev_dbg(aspeed_jtag->dev, + "Chunk len=%d chunk_size=%d remain_xfer=%lu\n", + xfer->length, ASPEED_JTAG_DATA_CHUNK_SIZE, + remain_xfer); + shift_bits = ASPEED_JTAG_DATA_CHUNK_SIZE; + + /* + * Read bytes were not equals to column length + * and continue in Shift IR/DR + */ + if (aspeed_jtag_xfer_push_data(aspeed_jtag, xfer->type, + shift_bits) != 0) { + return -EFAULT; + } + } else { + /* + * Read bytes equals to column length + */ + shift_bits = remain_xfer; + if (scan_end) { + /* + * If this data is the end of the transmission + * send remaining bits and go to endstate + */ + dev_dbg(aspeed_jtag->dev, + "Last len=%d chunk_size=%d remain_xfer=%lu\n", + xfer->length, + ASPEED_JTAG_DATA_CHUNK_SIZE, + remain_xfer); + if (aspeed_jtag_xfer_push_data_last( + aspeed_jtag, + xfer->type, + shift_bits, + xfer->endstate) != 0) { + return -EFAULT; + } + } else { + /* + * If transmission is waiting for additional + * data send remaining bits and stay in + * SHIFT IR/DR + */ + dev_dbg(aspeed_jtag->dev, + "Tail len=%d chunk_size=%d remain_xfer=%lu\n", + xfer->length, + ASPEED_JTAG_DATA_CHUNK_SIZE, + remain_xfer); + if (aspeed_jtag_xfer_push_data(aspeed_jtag, + xfer->type, + shift_bits) + != 0) { + return -EFAULT; + } + } + } + + if (xfer->direction & JTAG_READ_XFER) { + if (shift_bits < ASPEED_JTAG_DATA_CHUNK_SIZE) { + data[index] = aspeed_jtag_read(aspeed_jtag, + data_reg); + + data[index] >>= ASPEED_JTAG_DATA_CHUNK_SIZE - + shift_bits; + } else { + data[index] = aspeed_jtag_read(aspeed_jtag, + data_reg); + } + } + + remain_xfer = remain_xfer - shift_bits; + index++; + } + return 0; +} + +static int aspeed_jtag_xfer(struct jtag *jtag, struct jtag_xfer *xfer, + u8 *xfer_data) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + if (!(aspeed_jtag->mode & JTAG_XFER_HW_MODE)) { + /* SW mode */ + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_TDIO, + ASPEED_JTAG_SW); + + aspeed_jtag_xfer_sw(aspeed_jtag, xfer, (u32 *)xfer_data); + } else { + /* HW mode */ + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_SW); + if (aspeed_jtag_xfer_hw(aspeed_jtag, xfer, + (u32 *)xfer_data) != 0) + return -EFAULT; + } + + aspeed_jtag->status = xfer->endstate; + return 0; +} + +static int aspeed_jtag_status_get(struct jtag *jtag, u32 *status) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + *status = aspeed_jtag->status; + return 0; +} + +#ifdef USE_INTERRUPTS +static irqreturn_t aspeed_jtag_interrupt(s32 this_irq, void *dev_id) +{ + struct aspeed_jtag *aspeed_jtag = dev_id; + irqreturn_t ret = IRQ_HANDLED; + u32 status; + + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); + + if (status & ASPEED_JTAG_ISR_INT_MASK) { + aspeed_jtag_write(aspeed_jtag, + (status & ASPEED_JTAG_ISR_INT_MASK) + | (status & ASPEED_JTAG_ISR_INT_EN_MASK), + ASPEED_JTAG_ISR); + aspeed_jtag->flag |= status & ASPEED_JTAG_ISR_INT_MASK; + } + + if (aspeed_jtag->flag) { + wake_up_interruptible(&aspeed_jtag->jtag_wq); + ret = IRQ_HANDLED; + } else { + dev_err(aspeed_jtag->dev, "irq status:%x\n", + status); + ret = IRQ_NONE; + } + return ret; +} +#endif + +static int aspeed_jtag_enable(struct jtag *jtag) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + aspeed_jtag_master(aspeed_jtag); + return 0; +} + +static int aspeed_jtag_disable(struct jtag *jtag) +{ + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); + + aspeed_jtag_slave(aspeed_jtag); + return 0; +} + +static int aspeed_jtag_init(struct platform_device *pdev, + struct aspeed_jtag *aspeed_jtag) +{ + struct resource *res; + struct resource *scu_res; +#ifdef USE_INTERRUPTS + int err; +#endif + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + aspeed_jtag->reg_base = devm_ioremap_resource(aspeed_jtag->dev, res); + if (IS_ERR(aspeed_jtag->reg_base)) + return -ENOMEM; + + scu_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + aspeed_jtag->scu_base = devm_ioremap_resource(aspeed_jtag->dev, + scu_res); + if (IS_ERR(aspeed_jtag->scu_base)) + return -ENOMEM; + + aspeed_jtag->pclk = devm_clk_get(aspeed_jtag->dev, NULL); + if (IS_ERR(aspeed_jtag->pclk)) { + dev_err(aspeed_jtag->dev, "devm_clk_get failed\n"); + return PTR_ERR(aspeed_jtag->pclk); + } + +#ifdef USE_INTERRUPTS + aspeed_jtag->irq = platform_get_irq(pdev, 0); + if (aspeed_jtag->irq < 0) { + dev_err(aspeed_jtag->dev, "no irq specified\n"); + return -ENOENT; + } +#endif + + if (clk_prepare_enable(aspeed_jtag->pclk)) { + dev_err(aspeed_jtag->dev, "no irq specified\n"); + return -ENOENT; + } + + aspeed_jtag->rst = devm_reset_control_get_shared(&pdev->dev, NULL); + if (IS_ERR(aspeed_jtag->rst)) { + dev_err(aspeed_jtag->dev, + "missing or invalid reset controller device tree entry"); + return PTR_ERR(aspeed_jtag->rst); + } + reset_control_deassert(aspeed_jtag->rst); + +#ifdef USE_INTERRUPTS + err = devm_request_irq(aspeed_jtag->dev, aspeed_jtag->irq, + aspeed_jtag_interrupt, 0, + "aspeed-jtag", aspeed_jtag); + if (err) { + dev_err(aspeed_jtag->dev, "unable to get IRQ"); + clk_disable_unprepare(aspeed_jtag->pclk); + return err; + } +#endif + + aspeed_jtag_slave(aspeed_jtag); + + aspeed_jtag->flag = 0; + aspeed_jtag->mode = 0; + init_waitqueue_head(&aspeed_jtag->jtag_wq); + return 0; +} + +static int aspeed_jtag_deinit(struct platform_device *pdev, + struct aspeed_jtag *aspeed_jtag) +{ + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_ISR); + /* Disable clock */ + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_CTRL); + reset_control_assert(aspeed_jtag->rst); + clk_disable_unprepare(aspeed_jtag->pclk); + return 0; +} + +static const struct jtag_ops aspeed_jtag_ops = { + .freq_get = aspeed_jtag_freq_get, + .freq_set = aspeed_jtag_freq_set, + .status_get = aspeed_jtag_status_get, + .status_set = aspeed_jtag_status_set, + .xfer = aspeed_jtag_xfer, + .mode_set = aspeed_jtag_mode_set, + .bitbang = aspeed_jtag_bitbang, + .enable = aspeed_jtag_enable, + .disable = aspeed_jtag_disable +}; + +static int aspeed_jtag_probe(struct platform_device *pdev) +{ + struct aspeed_jtag *aspeed_jtag; + struct jtag *jtag; + int err; + + jtag = jtag_alloc(&pdev->dev, sizeof(*aspeed_jtag), &aspeed_jtag_ops); + if (!jtag) + return -ENOMEM; + + platform_set_drvdata(pdev, jtag); + aspeed_jtag = jtag_priv(jtag); + aspeed_jtag->dev = &pdev->dev; + + /* Initialize device*/ + err = aspeed_jtag_init(pdev, aspeed_jtag); + if (err) + goto err_jtag_init; + + /* Initialize JTAG core structure*/ + err = devm_jtag_register(aspeed_jtag->dev, jtag); + if (err) + goto err_jtag_register; + + return 0; + +err_jtag_register: + aspeed_jtag_deinit(pdev, aspeed_jtag); +err_jtag_init: + jtag_free(jtag); + return err; +} + +static int aspeed_jtag_remove(struct platform_device *pdev) +{ + struct jtag *jtag = platform_get_drvdata(pdev); + + aspeed_jtag_deinit(pdev, jtag_priv(jtag)); + return 0; +} + +static const struct of_device_id aspeed_jtag_of_match[] = { + { .compatible = "aspeed,ast2400-jtag", }, + { .compatible = "aspeed,ast2500-jtag", }, + {} +}; + +static struct platform_driver aspeed_jtag_driver = { + .probe = aspeed_jtag_probe, + .remove = aspeed_jtag_remove, + .driver = { + .name = ASPEED_JTAG_NAME, + .of_match_table = aspeed_jtag_of_match, + }, +}; +module_platform_driver(aspeed_jtag_driver); + +MODULE_AUTHOR("Oleksandr Shamray <oleksandrs@mellanox.com>"); +MODULE_DESCRIPTION("ASPEED JTAG driver"); +MODULE_LICENSE("GPL v2"); -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver 2020-04-13 22:29 ` [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver Ernesto Corona @ 2020-09-28 2:17 ` Moritz Fischer 2021-01-15 11:53 ` Paul Fertser 1 sibling, 0 replies; 17+ messages in thread From: Moritz Fischer @ 2020-09-28 2:17 UTC (permalink / raw) To: Ernesto Corona Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed, Oleksandr Shamray, Jiri Pirko, Joel Stanley, Andrew Jeffery, Philipp Zabel, Steven Filary, Vadim Pasternak, Amithash Prasad, Patrick Williams, Rgrs Hi Ernesto, Oleksandr, On Mon, Apr 13, 2020 at 03:29:17PM -0700, Ernesto Corona wrote: > Driver adds support of Aspeed 2500/2400 series SOC JTAG master controller. > > Driver implements the following jtag ops: > - freq_get; > - freq_set; > - status_get; > - status_set > - xfer; > - mode_set; > - bitbang; > - enable; > - disable; A few remarks inline, and a general question. Apologies if I missed earlier discussions on the subject. Have you (and the other authors considered instead of making this one misc device per controller, to make it tie in a bit more with the driver model? I was thinking along the lines of having it look a bit more like the spi subsystem, with each controller (maybe we can use that instead of 'master') being part of a bus that tracks it's state, where each TAP (maybe instead of slave) becomes a device in the device model. We could then have (similar to spidev) have a /dev/jtagdevX per TAP, making the user ABI somewhat more friendly rather than having the kernel just be a pass-through driver. > > It has been tested on Mellanox system with BMC equipped with > Aspeed 2520 SoC for programming CPLD devices. > > It has also been tested on Intel system using Aspeed 25xx SoC > for JTAG communication. > > Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> > Signed-off-by: Jiri Pirko <jiri@mellanox.com> > Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> > Acked-by: Arnd Bergmann <arnd@arndb.de> > Acked-by: Philippe Ombredanne <pombredanne@nexb.com> > Acked-by: Joel Stanley <joel@jms.id.au> > Cc: Joel Stanley <joel@jms.id.au> > Cc: Andrew Jeffery <andrew@aj.id.au> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Steven Filary <steven.a.filary@intel.com> > Cc: Vadim Pasternak <vadimp@mellanox.com> > Cc: Amithash Prasad <amithash@fb.com> > Cc: Patrick Williams <patrickw3@fb.com> > Cc: Rgrs <rgrs@protonmail.com> > --- > v28->v29 > v27->v28 > Comments pointed by Steven Filary <steven.a.filary@intel.com> > - Replace JTAG_IOCRUNTEST with JTAG_SIOCSTATE adding support for all TAPC > end states in SW mode using a lookup table to navigate across states. > - Add support for simultaneous READ/WRITE transfers(JTAG_READ_WRITE_XFER). > - Support for switching JTAG controller mode between slave and master > mode. > - Setup JTAG controller mode to master only when the driver is opened, > letting other HW to own the JTAG bus when it isn't in use. > - Include JTAG bit bang IOCTL for low level JTAG control usage > (JTAG_IOCBITBANG). > - Add debug traces. > - Add support for register polling (default) due it is 3 times faster than > interrupt mode. Define USE_INTERRUPTS macro to enable interrupt usage. > - Remove unnecessary delays for aspeed_jtag_status_set function. It makes > SW mode 4 times faster. > - Clean data buffer on aspeed_jtag_xfer_sw before tdo writes to avoid data > output corruption for read operations in SW mode. > - Correct register settings for HW mode transfer operations. > - Propagate ret codes all the way from low level functions up to > JTAG_IOCXFER call. > - Support for partitioned transfers. Single JTAG transfer through > multiples JTAG_IOCXFER calls. Now end transmission(scan_end) also > evaluates transfer end state. > > v26->v27 > Changes made by Oleksandr Shamray <oleksandrs@mellamnox.com> > - change aspeed_jtag_sw_delay to udelay function in bit-bang operation > > v25->v26 > v24->v25 > Comments pointed by Greg KH <gregkh@linuxfoundation.org> > - reduced debug printouts > > v23->v24 > v22->v23 > v21->v22 > Comments pointed by Andy Shevchenko <andy.shevchenko@gmail.com> > - rearrange ASPEED register defines > - simplified JTAG divider calculation formula > - change delay function in bit-bang operation > - add helper functions for TAP states switching > - remove unnecessary comments > - remove redundant debug messages > - make dines for repetative register bit sets > - fixed indentation > - change checks from negative to positive > - add error check for clk_prepare_enable > - rework driver alloc/register to devm_ variant > - Increasing line length up to 85 in order to improve readability > > v20->v21 > v19->v20 > Notifications from kbuild test robot <lkp@intel.com> > - add static declaration to 'aspeed_jtag_init' and > 'aspeed_jtag_deinit' functions > > v18->v19 > v17->v18 > v16->v17 > v15->v16 > Comments pointed by Joel Stanley <joel.stan@gmail.com> > - Add reset_control on Jtag init/deinit > > v14->v15 > Comments pointed by Joel Stanley <joel.stan@gmail.com> > - Add ARCH_ASPEED || COMPILE_TEST to Kconfig > - remove unused offset variable > - remove "aspeed_jtag" from dev_err and dev_dbg messages > - change clk_prepare_enable initialisation order > > v13->v14 > Comments pointed by Philippe Ombredanne <pombredanne@nexb.com> > - Change style of head block comment from /**/ to // > > v12->v13 > Comments pointed by Philippe Ombredanne <pombredanne@nexb.com> > - Change jtag-aspeed.c licence type to > SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note > and reorder line with license- add reset descriptions in bndings file > in description > Comments pointed by Kun Yi <kunyi@google.com> > - Changed capability check for aspeed,ast2400-jtag/ast200-jtag > > v11->v12 > Comments pointed by Chip Bilbrey <chip@bilbrey.org> > - Remove access mode from xfer and idle transactions > - Add new ioctl JTAG_SIOCMODE for set hw mode > > v10->v11 > v9->v10 > V8->v9 > Comments pointed by Arnd Bergmann <arnd@arndb.de> > - add *data parameter to xfer function prototype > > v7->v8 > Comments pointed by Joel Stanley <joel.stan@gmail.com> > - aspeed_jtag_init replace goto to return; > - change input variables type from __u32 to u32 > in functios freq_get, freq_set, status_get > - change sm_ variables type from char to u8 > - in jatg_init add disable clocks on error case > - remove release_mem_region on error case > - remove devm_free_irq on jtag_deinit > - Fix misspelling Disabe/Disable > - Change compatible string to ast2400 and ast2000 > > v6->v7 > Notifications from kbuild test robot <lkp@intel.com> > - Add include <linux/types.h> to jtag-asapeed.c > > v5->v6 > v4->v5 > Comments pointed by Arnd Bergmann <arnd@arndb.de> > - Added HAS_IOMEM dependence in Kconfig to avoid > "undefined reference to `devm_ioremap_resource'" error, > because in some arch this not supported > > v3->v4 > Comments pointed by Arnd Bergmann <arnd@arndb.de> > - change transaction pointer tdio type to __u64 > - change internal status type from enum to __u32 > > v2->v3 > > v1->v2 > Comments pointed by Greg KH <gregkh@linuxfoundation.org> > - change license type from GPLv2/BSD to GPLv2 > --- > drivers/jtag/Kconfig | 14 + > drivers/jtag/Makefile | 1 + > drivers/jtag/jtag-aspeed.c | 1027 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 1042 insertions(+) > create mode 100644 drivers/jtag/jtag-aspeed.c > > diff --git a/drivers/jtag/Kconfig b/drivers/jtag/Kconfig > index 47771fcd3c5b..0cc163f9ad44 100644 > --- a/drivers/jtag/Kconfig > +++ b/drivers/jtag/Kconfig > @@ -15,3 +15,17 @@ menuconfig JTAG > > To compile this driver as a module, choose M here: the module will > be called jtag. > + > +menuconfig JTAG_ASPEED > + tristate "Aspeed SoC JTAG controller support" > + depends on JTAG && HAS_IOMEM > + depends on ARCH_ASPEED || COMPILE_TEST > + help > + This provides a support for Aspeed JTAG device, equipped on > + Aspeed SoC 24xx and 25xx families. Drivers allows programming > + of hardware devices, connected to SoC through the JTAG interface. > + > + If you want this support, you should say Y here. > + > + To compile this driver as a module, choose M here: the module will > + be called jtag-aspeed. > diff --git a/drivers/jtag/Makefile b/drivers/jtag/Makefile > index af374939a9e6..04a855e2df28 100644 > --- a/drivers/jtag/Makefile > +++ b/drivers/jtag/Makefile > @@ -1 +1,2 @@ > obj-$(CONFIG_JTAG) += jtag.o > +obj-$(CONFIG_JTAG_ASPEED) += jtag-aspeed.o > diff --git a/drivers/jtag/jtag-aspeed.c b/drivers/jtag/jtag-aspeed.c > new file mode 100644 > index 000000000000..254548762dc5 > --- /dev/null > +++ b/drivers/jtag/jtag-aspeed.c > @@ -0,0 +1,1027 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// drivers/jtag/aspeed-jtag.c > +// > +// Copyright (c) 2018 Mellanox Technologies. All rights reserved. > +// Copyright (c) 2018 Oleksandr Shamray <oleksandrs@mellanox.com> > + > +#include <linux/clk.h> > +#include <linux/device.h> > +#include <linux/interrupt.h> > +#include <linux/jtag.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of_address.h> > +#include <linux/platform_device.h> > +#include <linux/reset.h> > +#include <linux/slab.h> > +#include <linux/types.h> > +#include <linux/delay.h> > +#include <uapi/linux/jtag.h> > + > +#define ASPEED_SCU_RESET_JTAG BIT(22) > + > +#define ASPEED_JTAG_DATA 0x00 > +#define ASPEED_JTAG_INST 0x04 > +#define ASPEED_JTAG_CTRL 0x08 > +#define ASPEED_JTAG_ISR 0x0C > +#define ASPEED_JTAG_SW 0x10 > +#define ASPEED_JTAG_TCK 0x14 > +#define ASPEED_JTAG_EC 0x18 > + > +#define ASPEED_JTAG_DATA_MSB 0x01 > +#define ASPEED_JTAG_DATA_CHUNK_SIZE 0x20 > + > +/* ASPEED_JTAG_CTRL: Engine Control */ > +#define ASPEED_JTAG_CTL_ENG_EN BIT(31) > +#define ASPEED_JTAG_CTL_ENG_OUT_EN BIT(30) > +#define ASPEED_JTAG_CTL_FORCE_TMS BIT(29) > +#define ASPEED_JTAG_CTL_IR_UPDATE BIT(26) > +#define ASPEED_JTAG_CTL_INST_LEN(x) ((x) << 20) > +#define ASPEED_JTAG_CTL_LASPEED_INST BIT(17) > +#define ASPEED_JTAG_CTL_INST_EN BIT(16) > +#define ASPEED_JTAG_CTL_DR_UPDATE BIT(10) > +#define ASPEED_JTAG_CTL_DATA_LEN(x) ((x) << 4) > +#define ASPEED_JTAG_CTL_LASPEED_DATA BIT(1) > +#define ASPEED_JTAG_CTL_DATA_EN BIT(0) > + > +/* ASPEED_JTAG_ISR : Interrupt status and enable */ > +#define ASPEED_JTAG_ISR_INST_PAUSE BIT(19) > +#define ASPEED_JTAG_ISR_INST_COMPLETE BIT(18) > +#define ASPEED_JTAG_ISR_DATA_PAUSE BIT(17) > +#define ASPEED_JTAG_ISR_DATA_COMPLETE BIT(16) > +#define ASPEED_JTAG_ISR_INST_PAUSE_EN BIT(3) > +#define ASPEED_JTAG_ISR_INST_COMPLETE_EN BIT(2) > +#define ASPEED_JTAG_ISR_DATA_PAUSE_EN BIT(1) > +#define ASPEED_JTAG_ISR_DATA_COMPLETE_EN BIT(0) > +#define ASPEED_JTAG_ISR_INT_EN_MASK GENMASK(3, 0) > +#define ASPEED_JTAG_ISR_INT_MASK GENMASK(19, 16) > + > +/* ASPEED_JTAG_SW : Software Mode and Status */ > +#define ASPEED_JTAG_SW_MODE_EN BIT(19) > +#define ASPEED_JTAG_SW_MODE_TCK BIT(18) > +#define ASPEED_JTAG_SW_MODE_TMS BIT(17) > +#define ASPEED_JTAG_SW_MODE_TDIO BIT(16) > + > +/* ASPEED_JTAG_TCK : TCK Control */ > +#define ASPEED_JTAG_TCK_DIVISOR_MASK GENMASK(10, 0) > +#define ASPEED_JTAG_TCK_GET_DIV(x) ((x) & ASPEED_JTAG_TCK_DIVISOR_MASK) > + > +/* ASPEED_JTAG_EC : Controller set for go to IDLE */ > +#define ASPEED_JTAG_EC_GO_IDLE BIT(0) > + > +#define ASPEED_JTAG_IOUT_LEN(len) \ > + (ASPEED_JTAG_CTL_ENG_EN | \ > + ASPEED_JTAG_CTL_ENG_OUT_EN | \ > + ASPEED_JTAG_CTL_INST_LEN(len)) > + > +#define ASPEED_JTAG_DOUT_LEN(len) \ > + (ASPEED_JTAG_CTL_ENG_EN | \ > + ASPEED_JTAG_CTL_ENG_OUT_EN | \ > + ASPEED_JTAG_CTL_DATA_LEN(len)) > + > +#define ASPEED_JTAG_SW_TDIO (ASPEED_JTAG_SW_MODE_EN | ASPEED_JTAG_SW_MODE_TDIO) > + > +#define ASPEED_JTAG_GET_TDI(direction, byte) \ > + (((direction) & JTAG_WRITE_XFER) ? byte : UINT_MAX) > + > +#define ASPEED_JTAG_TCK_WAIT 10 > +#define ASPEED_JTAG_RESET_CNTR 10 > +#define WAIT_ITERATIONS 75 > + > +/*#define USE_INTERRUPTS*/ > + > +static const char * const regnames[] = { > + [ASPEED_JTAG_DATA] = "ASPEED_JTAG_DATA", > + [ASPEED_JTAG_INST] = "ASPEED_JTAG_INST", > + [ASPEED_JTAG_CTRL] = "ASPEED_JTAG_CTRL", > + [ASPEED_JTAG_ISR] = "ASPEED_JTAG_ISR", > + [ASPEED_JTAG_SW] = "ASPEED_JTAG_SW", > + [ASPEED_JTAG_TCK] = "ASPEED_JTAG_TCK", > + [ASPEED_JTAG_EC] = "ASPEED_JTAG_EC", > +}; > + > +#define ASPEED_JTAG_NAME "jtag-aspeed" > + > +struct aspeed_jtag { > + void __iomem *reg_base; > + void __iomem *scu_base; > + struct device *dev; > + struct clk *pclk; > + enum jtag_endstate status; > + int irq; > + struct reset_control *rst; > + u32 flag; > + wait_queue_head_t jtag_wq; > + u32 mode; > +}; > + > +/* > + * This structure represents a TMS cycle, as expressed in a set of bits and a > + * count of bits (note: there are no start->end state transitions that require > + * more than 1 byte of TMS cycles) > + */ > +struct tms_cycle { > + unsigned char tmsbits; > + unsigned char count; > +}; > + > +/* > + * This is the complete set TMS cycles for going from any TAP state to any > + * other TAP state, following a "shortest path" rule. > + */ > +static const struct tms_cycle _tms_cycle_lookup[][16] = { > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* TLR */{{0x00, 0}, {0x00, 1}, {0x02, 2}, {0x02, 3}, {0x02, 4}, {0x0a, 4}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x0a, 5}, {0x2a, 6}, {0x1a, 5}, {0x06, 3}, {0x06, 4}, {0x06, 5}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x16, 5}, {0x16, 6}, {0x56, 7}, {0x36, 6} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* RTI */{{0x07, 3}, {0x00, 0}, {0x01, 1}, {0x01, 2}, {0x01, 3}, {0x05, 3}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x05, 4}, {0x15, 5}, {0x0d, 4}, {0x03, 2}, {0x03, 3}, {0x03, 4}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x0b, 4}, {0x0b, 5}, {0x2b, 6}, {0x1b, 5} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* SelDR*/{{0x03, 2}, {0x03, 3}, {0x00, 0}, {0x00, 1}, {0x00, 2}, {0x02, 2}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x02, 3}, {0x0a, 4}, {0x06, 3}, {0x01, 1}, {0x01, 2}, {0x01, 3}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x05, 3}, {0x05, 4}, {0x15, 5}, {0x0d, 4} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* CapDR*/{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x00, 0}, {0x00, 1}, {0x01, 1}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x01, 2}, {0x05, 3}, {0x03, 2}, {0x0f, 4}, {0x0f, 5}, {0x0f, 6}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x2f, 6}, {0x2f, 7}, {0xaf, 8}, {0x6f, 7} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* SDR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x00, 0}, {0x01, 1}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x01, 2}, {0x05, 3}, {0x03, 2}, {0x0f, 4}, {0x0f, 5}, {0x0f, 6}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x2f, 6}, {0x2f, 7}, {0xaf, 8}, {0x6f, 7} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* Ex1DR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x02, 3}, {0x00, 0}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x00, 1}, {0x02, 2}, {0x01, 1}, {0x07, 3}, {0x07, 4}, {0x07, 5}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x17, 5}, {0x17, 6}, {0x57, 7}, {0x37, 6} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* PDR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x01, 2}, {0x05, 3}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x00, 0}, {0x01, 1}, {0x03, 2}, {0x0f, 4}, {0x0f, 5}, {0x0f, 6}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x2f, 6}, {0x2f, 7}, {0xaf, 8}, {0x6f, 7} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* Ex2DR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x00, 1}, {0x02, 2}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x02, 3}, {0x00, 0}, {0x01, 1}, {0x07, 3}, {0x07, 4}, {0x07, 5}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x17, 5}, {0x17, 6}, {0x57, 7}, {0x37, 6} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* UpdDR*/{{0x07, 3}, {0x00, 1}, {0x01, 1}, {0x01, 2}, {0x01, 3}, {0x05, 3}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x05, 4}, {0x15, 5}, {0x00, 0}, {0x03, 2}, {0x03, 3}, {0x03, 4}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x0b, 4}, {0x0b, 5}, {0x2b, 6}, {0x1b, 5} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* SelIR*/{{0x01, 1}, {0x01, 2}, {0x05, 3}, {0x05, 4}, {0x05, 5}, {0x15, 5}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x15, 6}, {0x55, 7}, {0x35, 6}, {0x00, 0}, {0x00, 1}, {0x00, 2}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x02, 2}, {0x02, 3}, {0x0a, 4}, {0x06, 3} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* CapIR*/{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x07, 5}, {0x17, 5}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x17, 6}, {0x57, 7}, {0x37, 6}, {0x0f, 4}, {0x00, 0}, {0x00, 1}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x01, 1}, {0x01, 2}, {0x05, 3}, {0x03, 2} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* SIR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x07, 5}, {0x17, 5}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x17, 6}, {0x57, 7}, {0x37, 6}, {0x0f, 4}, {0x0f, 5}, {0x00, 0}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x01, 1}, {0x01, 2}, {0x05, 3}, {0x03, 2} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* Ex1IR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x03, 4}, {0x0b, 4}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x0b, 5}, {0x2b, 6}, {0x1b, 5}, {0x07, 3}, {0x07, 4}, {0x02, 3}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x00, 0}, {0x00, 1}, {0x02, 2}, {0x01, 1} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* PIR */{{0x1f, 5}, {0x03, 3}, {0x07, 3}, {0x07, 4}, {0x07, 5}, {0x17, 5}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x17, 6}, {0x57, 7}, {0x37, 6}, {0x0f, 4}, {0x0f, 5}, {0x01, 2}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x05, 3}, {0x00, 0}, {0x01, 1}, {0x03, 2} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* Ex2IR*/{{0x0f, 4}, {0x01, 2}, {0x03, 2}, {0x03, 3}, {0x03, 4}, {0x0b, 4}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x0b, 5}, {0x2b, 6}, {0x1b, 5}, {0x07, 3}, {0x07, 4}, {0x00, 1}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x02, 2}, {0x02, 3}, {0x00, 0}, {0x01, 1} }, > + > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* UpdIR*/{{0x07, 3}, {0x00, 1}, {0x01, 1}, {0x01, 2}, {0x01, 3}, {0x05, 3}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x05, 4}, {0x15, 5}, {0x0d, 4}, {0x03, 2}, {0x03, 3}, {0x03, 4}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x0b, 4}, {0x0b, 5}, {0x2b, 6}, {0x00, 0} }, > +}; Is this really driver specific? It seems to me like this could / should live in the core instead? > + > +static char *end_status_str[] = { > + "tlr", "idle", "selDR", "capDR", "sDR", "ex1DR", "pDR", "ex2DR", > + "updDR", "selIR", "capIR", "sIR", "ex1IR", "pIR", "ex2IR", "updIR" > +}; > + > +static u32 aspeed_jtag_read(struct aspeed_jtag *aspeed_jtag, u32 reg) > +{ > + u32 val = readl(aspeed_jtag->reg_base + reg); > + > + dev_dbg(aspeed_jtag->dev, "read:%s val = 0x%08x\n", regnames[reg], val); > + return val; > +} > + > +static void > +aspeed_jtag_write(struct aspeed_jtag *aspeed_jtag, u32 val, u32 reg) > +{ > + dev_dbg(aspeed_jtag->dev, "write:%s val = 0x%08x\n", > + regnames[reg], val); > + writel(val, aspeed_jtag->reg_base + reg); > +} > + > +static int aspeed_jtag_freq_set(struct jtag *jtag, u32 freq) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + unsigned long apb_frq; > + u32 tck_val; > + u16 div; > + > + apb_frq = clk_get_rate(aspeed_jtag->pclk); > + if (!apb_frq) > + return -ENOTSUPP; > + > + div = (apb_frq - 1) / freq; > + tck_val = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_TCK); > + aspeed_jtag_write(aspeed_jtag, > + (tck_val & ~ASPEED_JTAG_TCK_DIVISOR_MASK) | div, > + ASPEED_JTAG_TCK); > + return 0; > +} > + > +static int aspeed_jtag_freq_get(struct jtag *jtag, u32 *frq) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + u32 pclk; > + u32 tck; > + > + pclk = clk_get_rate(aspeed_jtag->pclk); > + tck = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_TCK); > + *frq = pclk / (ASPEED_JTAG_TCK_GET_DIV(tck) + 1); > + > + return 0; > +} > + > +static inline void aspeed_jtag_slave(struct aspeed_jtag *aspeed_jtag) > +{ > + u32 scu_reg = readl(aspeed_jtag->scu_base); > + > + writel(scu_reg | ASPEED_SCU_RESET_JTAG, aspeed_jtag->scu_base); > +} > + > +static inline void aspeed_jtag_master(struct aspeed_jtag *aspeed_jtag) > +{ > + u32 scu_reg = readl(aspeed_jtag->scu_base); > + > + writel(scu_reg & ~ASPEED_SCU_RESET_JTAG, aspeed_jtag->scu_base); > + > + aspeed_jtag_write(aspeed_jtag, (ASPEED_JTAG_CTL_ENG_EN | > + ASPEED_JTAG_CTL_ENG_OUT_EN), > + ASPEED_JTAG_CTRL); > + > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_MODE_EN | > + ASPEED_JTAG_SW_MODE_TDIO, > + ASPEED_JTAG_SW); > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_INST_PAUSE | > + ASPEED_JTAG_ISR_INST_COMPLETE | > + ASPEED_JTAG_ISR_DATA_PAUSE | > + ASPEED_JTAG_ISR_DATA_COMPLETE | > + ASPEED_JTAG_ISR_INST_PAUSE_EN | > + ASPEED_JTAG_ISR_INST_COMPLETE_EN | > + ASPEED_JTAG_ISR_DATA_PAUSE_EN | > + ASPEED_JTAG_ISR_DATA_COMPLETE_EN, > + ASPEED_JTAG_ISR); /* Enable Interrupt */ > +} > + > +static int aspeed_jtag_mode_set(struct jtag *jtag, struct jtag_mode *jtag_mode) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + switch (jtag_mode->feature) { > + case JTAG_XFER_MODE: > + aspeed_jtag->mode = jtag_mode->mode; > + break; > + case JTAG_CONTROL_MODE: > + if (jtag_mode->mode == JTAG_SLAVE_MODE) > + aspeed_jtag_slave(aspeed_jtag); > + else if (jtag_mode->mode == JTAG_MASTER_MODE) > + aspeed_jtag_master(aspeed_jtag); > + break; > + default: > + return -EINVAL; > + } > + return 0; > +} > + > +static char aspeed_jtag_tck_cycle(struct aspeed_jtag *aspeed_jtag, > + u8 tms, u8 tdi) > +{ > + char tdo = 0; > + > + /* TCK = 0 */ > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_MODE_EN | > + (tms * ASPEED_JTAG_SW_MODE_TMS) | > + (tdi * ASPEED_JTAG_SW_MODE_TDIO), ASPEED_JTAG_SW); > + > + aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_SW); > + > + /* TCK = 1 */ > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_MODE_EN | > + ASPEED_JTAG_SW_MODE_TCK | > + (tms * ASPEED_JTAG_SW_MODE_TMS) | > + (tdi * ASPEED_JTAG_SW_MODE_TDIO), ASPEED_JTAG_SW); > + > + if (aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_SW) & > + ASPEED_JTAG_SW_MODE_TDIO) > + tdo = 1; > + > + return tdo; > +} > + > +static int aspeed_jtag_bitbang(struct jtag *jtag, > + struct tck_bitbang *tck_bitbang) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + tck_bitbang->tdo = aspeed_jtag_tck_cycle(aspeed_jtag, > + tck_bitbang->tms, > + tck_bitbang->tdi); > + return 0; > +} > + > +static int aspeed_jtag_wait_instruction_pause(struct aspeed_jtag *aspeed_jtag) > +{ > + int res = 0; > +#ifdef USE_INTERRUPTS > + res = wait_event_interruptible(aspeed_jtag->jtag_wq, > + aspeed_jtag->flag & > + ASPEED_JTAG_ISR_INST_PAUSE); > + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_INST_PAUSE; > +#else > + u32 status = 0; > + u32 iterations = 0; > + > + while ((status & ASPEED_JTAG_ISR_INST_PAUSE) == 0) { > + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); > + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); > + iterations++; > + if (iterations > WAIT_ITERATIONS) { > + dev_err(aspeed_jtag->dev, > + "aspeed_jtag driver timed out waiting for instruction pause complete\n"); > + res = -EFAULT; > + break; > + } > + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { > + if (iterations % 25 == 0) > + usleep_range(1, 5); > + else > + udelay(1); > + } > + } > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_INST_PAUSE | > + (status & 0xf), > + ASPEED_JTAG_ISR); > +#endif > + return res; > +} > + > +static int > +aspeed_jtag_wait_instruction_complete(struct aspeed_jtag *aspeed_jtag) > +{ > + int res = 0; > +#ifdef USE_INTERRUPTS > + res = wait_event_interruptible(aspeed_jtag->jtag_wq, > + aspeed_jtag->flag & > + ASPEED_JTAG_ISR_INST_COMPLETE); > + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_INST_COMPLETE; > +#else > + u32 status = 0; > + u32 iterations = 0; > + > + while ((status & ASPEED_JTAG_ISR_INST_COMPLETE) == 0) { > + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); > + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); > + iterations++; > + if (iterations > WAIT_ITERATIONS) { > + dev_err(aspeed_jtag->dev, > + "aspeed_jtag driver timed out waiting for instruction complete\n"); > + res = -EFAULT; > + break; > + } > + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { > + if (iterations % 25 == 0) > + usleep_range(1, 5); > + else > + udelay(1); > + } > + } > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_INST_COMPLETE | > + (status & 0xf), > + ASPEED_JTAG_ISR); > +#endif > + return res; > +} > + > +static int > +aspeed_jtag_wait_data_pause_complete(struct aspeed_jtag *aspeed_jtag) > +{ > + int res = 0; > +#ifdef USE_INTERRUPTS > + res = wait_event_interruptible(aspeed_jtag->jtag_wq, > + aspeed_jtag->flag & > + ASPEED_JTAG_ISR_DATA_PAUSE); > + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_DATA_PAUSE; > +#else > + u32 status = 0; > + u32 iterations = 0; > + > + while ((status & ASPEED_JTAG_ISR_DATA_PAUSE) == 0) { > + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); > + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); > + iterations++; > + if (iterations > WAIT_ITERATIONS) { > + dev_err(aspeed_jtag->dev, > + "aspeed_jtag driver timed out waiting for data pause complete\n"); > + res = -EFAULT; > + break; > + } > + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { > + if (iterations % 25 == 0) > + usleep_range(1, 5); > + else > + udelay(1); > + } > + } > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_ISR_DATA_PAUSE | > + (status & 0xf), ASPEED_JTAG_ISR); > +#endif > + return res; > +} > + > +static int aspeed_jtag_wait_data_complete(struct aspeed_jtag *aspeed_jtag) > +{ > + int res = 0; > +#ifdef USE_INTERRUPTS > + res = wait_event_interruptible(aspeed_jtag->jtag_wq, > + aspeed_jtag->flag & > + ASPEED_JTAG_ISR_DATA_COMPLETE); > + aspeed_jtag->flag &= ~ASPEED_JTAG_ISR_DATA_COMPLETE; > +#else > + u32 status = 0; > + u32 iterations = 0; > + > + while ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { > + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); > + dev_dbg(aspeed_jtag->dev, "%s = 0x%08x\n", __func__, status); > + iterations++; > + if (iterations > WAIT_ITERATIONS) { > + dev_err(aspeed_jtag->dev, > + "ast_jtag driver timed out waiting for data complete\n"); > + res = -EFAULT; > + break; > + } > + if ((status & ASPEED_JTAG_ISR_DATA_COMPLETE) == 0) { > + if (iterations % 25 == 0) > + usleep_range(1, 5); > + else > + udelay(1); > + } > + } > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_ISR_DATA_COMPLETE | (status & 0xf), > + ASPEED_JTAG_ISR); > +#endif > + return res; > +} > + > +static void aspeed_jtag_set_tap_state(struct aspeed_jtag *aspeed_jtag, > + enum jtag_endstate endstate) > +{ > + int i = 0; > + enum jtag_endstate from, to; > + > + from = aspeed_jtag->status; > + to = endstate; > + for (i = 0; i < _tms_cycle_lookup[from][to].count; i++) > + aspeed_jtag_tck_cycle(aspeed_jtag, > + ((_tms_cycle_lookup[from][to].tmsbits >> i) & 0x1), 0); > + aspeed_jtag->status = endstate; > +} > + > +static void aspeed_jtag_end_tap_state_sw(struct aspeed_jtag *aspeed_jtag, > + struct jtag_end_tap_state *endstate) > +{ > + /* SW mode from curent tap state -> to end_state */ > + if (endstate->reset) { > + int i = 0; > + > + for (i = 0; i < ASPEED_JTAG_RESET_CNTR; i++) > + aspeed_jtag_tck_cycle(aspeed_jtag, 1, 0); > + aspeed_jtag->status = JTAG_STATE_TLRESET; > + } > + > + aspeed_jtag_set_tap_state(aspeed_jtag, endstate->endstate); > +} > + > +static int aspeed_jtag_status_set(struct jtag *jtag, > + struct jtag_end_tap_state *endstate) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + dev_dbg(aspeed_jtag->dev, "Set TAP state: %s\n", > + end_status_str[endstate->endstate]); > + > + if (!(aspeed_jtag->mode & JTAG_XFER_HW_MODE)) { > + aspeed_jtag_end_tap_state_sw(aspeed_jtag, endstate); > + return 0; > + } > + > + /* x TMS high + 1 TMS low */ > + if (endstate->reset) { > + /* Disable sw mode */ > + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_SW); > + mdelay(1); > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_CTL_ENG_EN | > + ASPEED_JTAG_CTL_ENG_OUT_EN | > + ASPEED_JTAG_CTL_FORCE_TMS, ASPEED_JTAG_CTRL); > + mdelay(1); > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_SW_TDIO, ASPEED_JTAG_SW); > + aspeed_jtag->status = JTAG_STATE_TLRESET; > + } > + > + return 0; > +} > + > +static void aspeed_jtag_xfer_sw(struct aspeed_jtag *aspeed_jtag, > + struct jtag_xfer *xfer, u32 *data) > +{ > + unsigned long remain_xfer = xfer->length; > + unsigned long shift_bits = 0; > + unsigned long index = 0; > + unsigned long tdi; > + char tdo; > + > + dev_dbg(aspeed_jtag->dev, "SW JTAG SHIFT %s, length = %d\n", > + (xfer->type == JTAG_SIR_XFER) ? "IR" : "DR", xfer->length); > + > + if (xfer->type == JTAG_SIR_XFER) > + aspeed_jtag_set_tap_state(aspeed_jtag, JTAG_STATE_SHIFTIR); > + else > + aspeed_jtag_set_tap_state(aspeed_jtag, JTAG_STATE_SHIFTDR); > + > + tdi = ASPEED_JTAG_GET_TDI(xfer->direction, data[index]); > + data[index] = 0; > + while (remain_xfer > 1) { > + tdo = aspeed_jtag_tck_cycle(aspeed_jtag, 0, > + tdi & ASPEED_JTAG_DATA_MSB); > + data[index] |= tdo << (shift_bits % > + ASPEED_JTAG_DATA_CHUNK_SIZE); > + tdi >>= 1; > + shift_bits++; > + remain_xfer--; > + > + if (shift_bits % ASPEED_JTAG_DATA_CHUNK_SIZE == 0) { > + tdo = 0; > + index++; > + tdi = ASPEED_JTAG_GET_TDI(xfer->direction, data[index]); > + data[index] = 0; > + } > + } > + > + if ((xfer->endstate == (xfer->type == JTAG_SIR_XFER ? > + JTAG_STATE_SHIFTIR : JTAG_STATE_SHIFTDR))) { > + /* Stay in Shift IR/DR*/ > + tdo = aspeed_jtag_tck_cycle(aspeed_jtag, 0, > + tdi & ASPEED_JTAG_DATA_MSB); > + data[index] |= tdo << (shift_bits % > + ASPEED_JTAG_DATA_CHUNK_SIZE); > + } else { > + /* Goto end state */ > + tdo = aspeed_jtag_tck_cycle(aspeed_jtag, 1, > + tdi & ASPEED_JTAG_DATA_MSB); > + data[index] |= tdo << (shift_bits % > + ASPEED_JTAG_DATA_CHUNK_SIZE); > + aspeed_jtag->status = (xfer->type == JTAG_SIR_XFER) ? > + JTAG_STATE_EXIT1IR : JTAG_STATE_EXIT1DR; > + aspeed_jtag_set_tap_state(aspeed_jtag, xfer->endstate); > + } > +} > + > +static int aspeed_jtag_xfer_push_data(struct aspeed_jtag *aspeed_jtag, > + enum jtag_xfer_type type, u32 bits_len) > +{ > + int res = 0; > + > + if (type == JTAG_SIR_XFER) { > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_IOUT_LEN(bits_len), > + ASPEED_JTAG_CTRL); > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_IOUT_LEN(bits_len) | > + ASPEED_JTAG_CTL_INST_EN, ASPEED_JTAG_CTRL); > + res = aspeed_jtag_wait_instruction_pause(aspeed_jtag); > + } else { > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_DOUT_LEN(bits_len), > + ASPEED_JTAG_CTRL); > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_DOUT_LEN(bits_len) | > + ASPEED_JTAG_CTL_DATA_EN, ASPEED_JTAG_CTRL); > + res = aspeed_jtag_wait_data_pause_complete(aspeed_jtag); > + } > + return res; > +} > + > +static int aspeed_jtag_xfer_push_data_last(struct aspeed_jtag *aspeed_jtag, > + enum jtag_xfer_type type, > + u32 shift_bits, > + enum jtag_endstate endstate) > +{ > + int res = 0; > + > + if (type == JTAG_SIR_XFER) { > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_IOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_INST, > + ASPEED_JTAG_CTRL); > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_IOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_INST | > + ASPEED_JTAG_CTL_INST_EN, > + ASPEED_JTAG_CTRL); > + res = aspeed_jtag_wait_instruction_complete(aspeed_jtag); > + } else { > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_DOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_DATA, > + ASPEED_JTAG_CTRL); > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_DOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_DATA | > + ASPEED_JTAG_CTL_DATA_EN, > + ASPEED_JTAG_CTRL); > + res = aspeed_jtag_wait_data_complete(aspeed_jtag); > + } > + return res; > +} > + > +static int aspeed_jtag_xfer_hw(struct aspeed_jtag *aspeed_jtag, > + struct jtag_xfer *xfer, u32 *data) > +{ > + unsigned long remain_xfer = xfer->length; > + unsigned long index = 0; > + char shift_bits; > + u32 data_reg; > + u32 scan_end; > + > + dev_dbg(aspeed_jtag->dev, "HW JTAG SHIFT %s, length = %d\n", > + (xfer->type == JTAG_SIR_XFER) ? "IR" : "DR", xfer->length); > + data_reg = xfer->type == JTAG_SIR_XFER ? > + ASPEED_JTAG_INST : ASPEED_JTAG_DATA; > + if (xfer->endstate == JTAG_STATE_SHIFTIR || > + xfer->endstate == JTAG_STATE_SHIFTDR || > + xfer->endstate == JTAG_STATE_PAUSEIR || > + xfer->endstate == JTAG_STATE_PAUSEDR) { > + scan_end = 0; > + } else { > + scan_end = 1; > + } > + > + while (remain_xfer) { > + if (xfer->direction & JTAG_WRITE_XFER) > + aspeed_jtag_write(aspeed_jtag, data[index], data_reg); > + else > + aspeed_jtag_write(aspeed_jtag, 0, data_reg); > + > + if (remain_xfer > ASPEED_JTAG_DATA_CHUNK_SIZE) { > + dev_dbg(aspeed_jtag->dev, > + "Chunk len=%d chunk_size=%d remain_xfer=%lu\n", > + xfer->length, ASPEED_JTAG_DATA_CHUNK_SIZE, > + remain_xfer); > + shift_bits = ASPEED_JTAG_DATA_CHUNK_SIZE; > + > + /* > + * Read bytes were not equals to column length > + * and continue in Shift IR/DR > + */ > + if (aspeed_jtag_xfer_push_data(aspeed_jtag, xfer->type, > + shift_bits) != 0) { > + return -EFAULT; > + } > + } else { > + /* > + * Read bytes equals to column length > + */ > + shift_bits = remain_xfer; > + if (scan_end) { > + /* > + * If this data is the end of the transmission > + * send remaining bits and go to endstate > + */ > + dev_dbg(aspeed_jtag->dev, > + "Last len=%d chunk_size=%d remain_xfer=%lu\n", > + xfer->length, > + ASPEED_JTAG_DATA_CHUNK_SIZE, > + remain_xfer); > + if (aspeed_jtag_xfer_push_data_last( > + aspeed_jtag, > + xfer->type, > + shift_bits, > + xfer->endstate) != 0) { > + return -EFAULT; > + } > + } else { > + /* > + * If transmission is waiting for additional > + * data send remaining bits and stay in > + * SHIFT IR/DR > + */ > + dev_dbg(aspeed_jtag->dev, > + "Tail len=%d chunk_size=%d remain_xfer=%lu\n", > + xfer->length, > + ASPEED_JTAG_DATA_CHUNK_SIZE, > + remain_xfer); > + if (aspeed_jtag_xfer_push_data(aspeed_jtag, > + xfer->type, > + shift_bits) > + != 0) { > + return -EFAULT; > + } > + } > + } > + > + if (xfer->direction & JTAG_READ_XFER) { > + if (shift_bits < ASPEED_JTAG_DATA_CHUNK_SIZE) { > + data[index] = aspeed_jtag_read(aspeed_jtag, > + data_reg); > + > + data[index] >>= ASPEED_JTAG_DATA_CHUNK_SIZE - > + shift_bits; > + } else { > + data[index] = aspeed_jtag_read(aspeed_jtag, > + data_reg); > + } > + } > + > + remain_xfer = remain_xfer - shift_bits; > + index++; > + } > + return 0; > +} > + > +static int aspeed_jtag_xfer(struct jtag *jtag, struct jtag_xfer *xfer, > + u8 *xfer_data) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + if (!(aspeed_jtag->mode & JTAG_XFER_HW_MODE)) { > + /* SW mode */ > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_SW_TDIO, > + ASPEED_JTAG_SW); > + > + aspeed_jtag_xfer_sw(aspeed_jtag, xfer, (u32 *)xfer_data); > + } else { > + /* HW mode */ > + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_SW); > + if (aspeed_jtag_xfer_hw(aspeed_jtag, xfer, > + (u32 *)xfer_data) != 0) > + return -EFAULT; > + } > + > + aspeed_jtag->status = xfer->endstate; > + return 0; > +} > + > +static int aspeed_jtag_status_get(struct jtag *jtag, u32 *status) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + *status = aspeed_jtag->status; > + return 0; > +} > + > +#ifdef USE_INTERRUPTS > +static irqreturn_t aspeed_jtag_interrupt(s32 this_irq, void *dev_id) > +{ > + struct aspeed_jtag *aspeed_jtag = dev_id; > + irqreturn_t ret = IRQ_HANDLED; > + u32 status; > + > + status = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_ISR); > + > + if (status & ASPEED_JTAG_ISR_INT_MASK) { > + aspeed_jtag_write(aspeed_jtag, > + (status & ASPEED_JTAG_ISR_INT_MASK) > + | (status & ASPEED_JTAG_ISR_INT_EN_MASK), > + ASPEED_JTAG_ISR); > + aspeed_jtag->flag |= status & ASPEED_JTAG_ISR_INT_MASK; > + } > + > + if (aspeed_jtag->flag) { > + wake_up_interruptible(&aspeed_jtag->jtag_wq); > + ret = IRQ_HANDLED; > + } else { > + dev_err(aspeed_jtag->dev, "irq status:%x\n", > + status); > + ret = IRQ_NONE; > + } > + return ret; > +} > +#endif > + > +static int aspeed_jtag_enable(struct jtag *jtag) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + aspeed_jtag_master(aspeed_jtag); > + return 0; > +} > + > +static int aspeed_jtag_disable(struct jtag *jtag) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + aspeed_jtag_slave(aspeed_jtag); > + return 0; > +} > + > +static int aspeed_jtag_init(struct platform_device *pdev, > + struct aspeed_jtag *aspeed_jtag) > +{ > + struct resource *res; > + struct resource *scu_res; > +#ifdef USE_INTERRUPTS > + int err; > +#endif Apologies if this has been discussed earlier, can we pull that out of device-tree or a setting somehow instead? > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + aspeed_jtag->reg_base = devm_ioremap_resource(aspeed_jtag->dev, res); > + if (IS_ERR(aspeed_jtag->reg_base)) > + return -ENOMEM; > + > + scu_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + aspeed_jtag->scu_base = devm_ioremap_resource(aspeed_jtag->dev, > + scu_res); > + if (IS_ERR(aspeed_jtag->scu_base)) > + return -ENOMEM; > + > + aspeed_jtag->pclk = devm_clk_get(aspeed_jtag->dev, NULL); > + if (IS_ERR(aspeed_jtag->pclk)) { > + dev_err(aspeed_jtag->dev, "devm_clk_get failed\n"); > + return PTR_ERR(aspeed_jtag->pclk); > + } > + > +#ifdef USE_INTERRUPTS > + aspeed_jtag->irq = platform_get_irq(pdev, 0); > + if (aspeed_jtag->irq < 0) { > + dev_err(aspeed_jtag->dev, "no irq specified\n"); > + return -ENOENT; > + } > +#endif > + > + if (clk_prepare_enable(aspeed_jtag->pclk)) { > + dev_err(aspeed_jtag->dev, "no irq specified\n"); > + return -ENOENT; > + } > + > + aspeed_jtag->rst = devm_reset_control_get_shared(&pdev->dev, NULL); > + if (IS_ERR(aspeed_jtag->rst)) { > + dev_err(aspeed_jtag->dev, > + "missing or invalid reset controller device tree entry"); > + return PTR_ERR(aspeed_jtag->rst); > + } > + reset_control_deassert(aspeed_jtag->rst); > + > +#ifdef USE_INTERRUPTS > + err = devm_request_irq(aspeed_jtag->dev, aspeed_jtag->irq, > + aspeed_jtag_interrupt, 0, > + "aspeed-jtag", aspeed_jtag); > + if (err) { > + dev_err(aspeed_jtag->dev, "unable to get IRQ"); > + clk_disable_unprepare(aspeed_jtag->pclk); > + return err; > + } > +#endif > + > + aspeed_jtag_slave(aspeed_jtag); > + > + aspeed_jtag->flag = 0; > + aspeed_jtag->mode = 0; > + init_waitqueue_head(&aspeed_jtag->jtag_wq); > + return 0; > +} > + > +static int aspeed_jtag_deinit(struct platform_device *pdev, > + struct aspeed_jtag *aspeed_jtag) > +{ > + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_ISR); > + /* Disable clock */ > + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_CTRL); > + reset_control_assert(aspeed_jtag->rst); > + clk_disable_unprepare(aspeed_jtag->pclk); > + return 0; > +} > + > +static const struct jtag_ops aspeed_jtag_ops = { > + .freq_get = aspeed_jtag_freq_get, > + .freq_set = aspeed_jtag_freq_set, > + .status_get = aspeed_jtag_status_get, > + .status_set = aspeed_jtag_status_set, > + .xfer = aspeed_jtag_xfer, > + .mode_set = aspeed_jtag_mode_set, > + .bitbang = aspeed_jtag_bitbang, > + .enable = aspeed_jtag_enable, > + .disable = aspeed_jtag_disable > +}; > + > +static int aspeed_jtag_probe(struct platform_device *pdev) > +{ > + struct aspeed_jtag *aspeed_jtag; > + struct jtag *jtag; > + int err; > + > + jtag = jtag_alloc(&pdev->dev, sizeof(*aspeed_jtag), &aspeed_jtag_ops); > + if (!jtag) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, jtag); > + aspeed_jtag = jtag_priv(jtag); > + aspeed_jtag->dev = &pdev->dev; > + > + /* Initialize device*/ > + err = aspeed_jtag_init(pdev, aspeed_jtag); > + if (err) > + goto err_jtag_init; > + > + /* Initialize JTAG core structure*/ > + err = devm_jtag_register(aspeed_jtag->dev, jtag); > + if (err) > + goto err_jtag_register; > + > + return 0; > + > +err_jtag_register: > + aspeed_jtag_deinit(pdev, aspeed_jtag); > +err_jtag_init: > + jtag_free(jtag); > + return err; > +} > + > +static int aspeed_jtag_remove(struct platform_device *pdev) > +{ > + struct jtag *jtag = platform_get_drvdata(pdev); > + > + aspeed_jtag_deinit(pdev, jtag_priv(jtag)); > + return 0; > +} > + > +static const struct of_device_id aspeed_jtag_of_match[] = { > + { .compatible = "aspeed,ast2400-jtag", }, > + { .compatible = "aspeed,ast2500-jtag", }, > + {} > +}; > + > +static struct platform_driver aspeed_jtag_driver = { > + .probe = aspeed_jtag_probe, > + .remove = aspeed_jtag_remove, > + .driver = { > + .name = ASPEED_JTAG_NAME, > + .of_match_table = aspeed_jtag_of_match, > + }, > +}; > +module_platform_driver(aspeed_jtag_driver); > + > +MODULE_AUTHOR("Oleksandr Shamray <oleksandrs@mellanox.com>"); > +MODULE_DESCRIPTION("ASPEED JTAG driver"); > +MODULE_LICENSE("GPL v2"); > -- > 2.17.1 > In any case it looks like the state transitions should maybe be handled by the jtag core code instead? In any case feel free to add my to the CC list for future revisions, Thanks, Moritz ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver 2020-04-13 22:29 ` [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver Ernesto Corona 2020-09-28 2:17 ` Moritz Fischer @ 2021-01-15 11:53 ` Paul Fertser 1 sibling, 0 replies; 17+ messages in thread From: Paul Fertser @ 2021-01-15 11:53 UTC (permalink / raw) To: Ernesto Corona Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed, Vadim Pasternak, Andrew Jeffery, Steven Filary, Amithash Prasad, Jiri Pirko, Rgrs, Joel Stanley, Philipp Zabel, Patrick Williams, Oleksandr Shamray Please note that JTAG_XFER_HW_MODE seems to be broken, at least it doesn't work in my testing with exactly the same userspace and hardware so I wasn't properly evaluating it. On Mon, Apr 13, 2020 at 03:29:17PM -0700, Ernesto Corona wrote: > --- /dev/null > +++ b/drivers/jtag/jtag-aspeed.c ... > +/*#define USE_INTERRUPTS*/ I think if you implemented support for interrupts and DeviceTree provides the resource, then it should be enabled. If the support is untested or known to be buggy, it should be removed altogether and can be introduced later when the issues are sorted out. > +struct aspeed_jtag { > + void __iomem *reg_base; > + void __iomem *scu_base; SCU is manipulated by a separate driver, it shouldn't be here. > +/* > + * This is the complete set TMS cycles for going from any TAP state to any > + * other TAP state, following a "shortest path" rule. > + */ > +static const struct tms_cycle _tms_cycle_lookup[][16] = { > +/* TLR RTI SelDR CapDR SDR Ex1DR*/ > +/* TLR */{{0x00, 0}, {0x00, 1}, {0x02, 2}, {0x02, 3}, {0x02, 4}, {0x0a, 4}, > +/* PDR Ex2DR UpdDR SelIR CapIR SIR*/ > + {0x0a, 5}, {0x2a, 6}, {0x1a, 5}, {0x06, 3}, {0x06, 4}, {0x06, 5}, > +/* Ex1IR PIR Ex2IR UpdIR*/ > + {0x16, 5}, {0x16, 6}, {0x56, 7}, {0x36, 6} }, This belongs to the generic JTAG architecture layer rather than an individual driver. > +static int aspeed_jtag_freq_set(struct jtag *jtag, u32 freq) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + unsigned long apb_frq; > + u32 tck_val; > + u16 div; > + > + apb_frq = clk_get_rate(aspeed_jtag->pclk); > + if (!apb_frq) > + return -ENOTSUPP; > + > + div = (apb_frq - 1) / freq; > + tck_val = aspeed_jtag_read(aspeed_jtag, ASPEED_JTAG_TCK); > + aspeed_jtag_write(aspeed_jtag, > + (tck_val & ~ASPEED_JTAG_TCK_DIVISOR_MASK) | div, > + ASPEED_JTAG_TCK); > + return 0; > +} ASPEED datasheet says PCLK * 2 is used as the prescaler source, so this calculation is probably incorrect. This implementation seems to be also failing to check for the lower and upper limits and return an error in case the request can't be fulfilled. > +static inline void aspeed_jtag_slave(struct aspeed_jtag *aspeed_jtag) > +{ > + u32 scu_reg = readl(aspeed_jtag->scu_base); > + > + writel(scu_reg | ASPEED_SCU_RESET_JTAG, aspeed_jtag->scu_base); > +} reset_control_(de)assert should be used instead of direct SCU manipulation, here and in all the other places too. > +static void aspeed_jtag_end_tap_state_sw(struct aspeed_jtag *aspeed_jtag, > + struct jtag_end_tap_state *endstate) > +{ > + /* SW mode from curent tap state -> to end_state */ > + if (endstate->reset) { > + int i = 0; > + > + for (i = 0; i < ASPEED_JTAG_RESET_CNTR; i++) > + aspeed_jtag_tck_cycle(aspeed_jtag, 1, 0); > + aspeed_jtag->status = JTAG_STATE_TLRESET; > + } > + > + aspeed_jtag_set_tap_state(aspeed_jtag, endstate->endstate); > +} endstate->tck is ignored. > +static int aspeed_jtag_status_set(struct jtag *jtag, > + struct jtag_end_tap_state *endstate) > +{ > + struct aspeed_jtag *aspeed_jtag = jtag_priv(jtag); > + > + dev_dbg(aspeed_jtag->dev, "Set TAP state: %s\n", > + end_status_str[endstate->endstate]); > + > + if (!(aspeed_jtag->mode & JTAG_XFER_HW_MODE)) { > + aspeed_jtag_end_tap_state_sw(aspeed_jtag, endstate); > + return 0; > + } > + > + /* x TMS high + 1 TMS low */ > + if (endstate->reset) { > + /* Disable sw mode */ > + aspeed_jtag_write(aspeed_jtag, 0, ASPEED_JTAG_SW); > + mdelay(1); > + aspeed_jtag_write(aspeed_jtag, ASPEED_JTAG_CTL_ENG_EN | > + ASPEED_JTAG_CTL_ENG_OUT_EN | > + ASPEED_JTAG_CTL_FORCE_TMS, ASPEED_JTAG_CTRL); > + mdelay(1); > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_SW_TDIO, ASPEED_JTAG_SW); > + aspeed_jtag->status = JTAG_STATE_TLRESET; > + } > + > + return 0; > +} endstate->tck is ignored. > +static int aspeed_jtag_xfer_push_data_last(struct aspeed_jtag *aspeed_jtag, > + enum jtag_xfer_type type, > + u32 shift_bits, > + enum jtag_endstate endstate) > +{ > + int res = 0; > + > + if (type == JTAG_SIR_XFER) { > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_IOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_INST, > + ASPEED_JTAG_CTRL); > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_IOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_INST | > + ASPEED_JTAG_CTL_INST_EN, > + ASPEED_JTAG_CTRL); > + res = aspeed_jtag_wait_instruction_complete(aspeed_jtag); > + } else { > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_DOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_DATA, > + ASPEED_JTAG_CTRL); > + aspeed_jtag_write(aspeed_jtag, > + ASPEED_JTAG_DOUT_LEN(shift_bits) | > + ASPEED_JTAG_CTL_LASPEED_DATA | > + ASPEED_JTAG_CTL_DATA_EN, > + ASPEED_JTAG_CTRL); > + res = aspeed_jtag_wait_data_complete(aspeed_jtag); > + } > + return res; > +} endstate is ignored. > +static int aspeed_jtag_init(struct platform_device *pdev, > + struct aspeed_jtag *aspeed_jtag) > +{ > + struct resource *res; > + struct resource *scu_res; > +#ifdef USE_INTERRUPTS > + int err; > +#endif > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + aspeed_jtag->reg_base = devm_ioremap_resource(aspeed_jtag->dev, res); > + if (IS_ERR(aspeed_jtag->reg_base)) > + return -ENOMEM; > + > + scu_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + aspeed_jtag->scu_base = devm_ioremap_resource(aspeed_jtag->dev, > + scu_res); > + if (IS_ERR(aspeed_jtag->scu_base)) > + return -ENOMEM; This always fails either because the second IORESOURCE_MEM wasn't specified at all (as per the provided example in the dt-bindings documentation) or because the SCU region is already claimed by the SCU driver (if you try to specify it). Apparently this version of the patch series wasn't run-time tested at all. The driver works if this is removed altogether because reset_control_(de)assert calls do the right thing. -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v29 4/6] Documentation: jtag: Add ABI documentation 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona ` (2 preceding siblings ...) 2020-04-13 22:29 ` [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver Ernesto Corona @ 2020-04-13 22:29 ` Ernesto Corona 2021-01-19 12:01 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 5/6] Documentation jtag: Add JTAG core driver ioctl number Ernesto Corona ` (2 subsequent siblings) 6 siblings, 1 reply; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Cc: Ernesto Corona, Oleksandr Shamray, Jonathan Corbet, Arnd Bergmann, Mauro Carvalho Chehab, Linus Walleij, Manivannan Sadhasivam, Jeffrey Hugo, Steven Filary, Jiri Pirko, Vadim Pasternak, Amithash Prasad, Patrick Williams, Rgrs Added document that describe the ABI for JTAG class driver Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: Jeffrey Hugo <jhugo@codeaurora.org> Cc: Steven Filary <steven.a.filary@intel.com> Cc: Jiri Pirko <jiri@mellanox.com> Cc: Vadim Pasternak <vadimp@mellanox.com> Cc: Amithash Prasad <amithash@fb.com> Cc: Patrick Williams <patrickw3@fb.com> Cc: Rgrs <rgrs@protonmail.com> --- v28->v29 - Change ABI documentation to reStructuredText (rst) format. v27->v28 Comments pointed by Steven Filary <steven.a.filary@intel.com> - Replace JTAG_IOCRUNTEST with JTAG_SIOCSTATE adding support for all TAPC end states in SW mode using a lookup table to navigate across states. - Add support for simultaneous READ/WRITE transfers(JTAG_READ_WRITE_XFER). - Support for switching JTAG controller mode between slave and master mode. - Setup JTAG controller mode to master only when the driver is opened, letting other HW to own the JTAG bus when it isn't in use. - Include JTAG bit bang IOCTL for low level JTAG control usage (JTAG_IOCBITBANG). v26->v27 v25->v26 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - fix spell in ABI documentation v24->v25 Comments pointed by Greg KH <gregkh@linuxfoundation.org> - Fixed documentation according to new open() behavior v23->v24 v22->v23 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - fix spell in ABI doccumentation v21->v22 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - fix spell in ABI doccumentation v20->v21 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - Fix JTAG dirver help in Kconfig v19->v20 Comments pointed by Randy Dunlap <rdunlap@infradead.org> - Fix JTAG doccumentation v18->v19 Pavel Machek <pavel@ucw.cz> - Added JTAG doccumentation to Documentation/jtag v17->v18 v16->v17 v15->v16 v14->v15 v13->v14 v12->v13 v11->v12 Tobias Klauser <tklauser@distanz.ch> Comments pointed by - rename /Documentation/ABI/testing/jatg-dev -> jtag-dev - Typo: s/interfase/interface v10->v11 v9->v10 Fixes added by Oleksandr: - change jtag-cdev to jtag-dev in documentation - update KernelVersion and Date in jtag-dev documentation; v8->v9 v7->v8 v6->v7 Comments pointed by Pavel Machek <pavel@ucw.cz> - Added jtag-cdev documentation to Documentation/ABI/testing folder --- Documentation/ABI/testing/jtag-dev | 23 ++++ Documentation/index.rst | 1 + Documentation/jtag/index.rst | 18 +++ Documentation/jtag/jtag-summary.rst | 47 +++++++ Documentation/jtag/jtagdev.rst | 194 ++++++++++++++++++++++++++++ 5 files changed, 283 insertions(+) create mode 100644 Documentation/ABI/testing/jtag-dev create mode 100644 Documentation/jtag/index.rst create mode 100644 Documentation/jtag/jtag-summary.rst create mode 100644 Documentation/jtag/jtagdev.rst diff --git a/Documentation/ABI/testing/jtag-dev b/Documentation/ABI/testing/jtag-dev new file mode 100644 index 000000000000..423baab18761 --- /dev/null +++ b/Documentation/ABI/testing/jtag-dev @@ -0,0 +1,23 @@ +What: /dev/jtag[0-9]+ +Date: July 2018 +KernelVersion: 4.20 +Contact: oleksandrs@mellanox.com +Description: + The misc device files /dev/jtag* are the interface + between JTAG master interface and userspace. + + The ioctl(2)-based ABI is defined and documented in + [include/uapi]<linux/jtag.h>. + + The following file operations are supported: + + open(2) + Opens and allocates file descriptor. + + ioctl(2) + Initiate various actions. + See the inline documentation in [include/uapi]<linux/jtag.h> + for descriptions of all ioctls. + +Users: + userspace tools which wants to access to JTAG bus diff --git a/Documentation/index.rst b/Documentation/index.rst index 9599c0f3eea8..f75e8fa17d0e 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -108,6 +108,7 @@ needed). iio/index isdn/index infiniband/index + jtag/index leds/index media/index netlabel/index diff --git a/Documentation/jtag/index.rst b/Documentation/jtag/index.rst new file mode 100644 index 000000000000..8a2761d1c17e --- /dev/null +++ b/Documentation/jtag/index.rst @@ -0,0 +1,18 @@ +.. SPDX-License-Identifier: GPL-2.0 + +============================== +Joint Test Action Group (JTAG) +============================== + +.. toctree:: + :maxdepth: 1 + + jtag-summary + jtagdev + +.. only:: subproject and html + + Indices + ======= + + * :ref:`genindex` diff --git a/Documentation/jtag/jtag-summary.rst b/Documentation/jtag/jtag-summary.rst new file mode 100644 index 000000000000..7d3211be9096 --- /dev/null +++ b/Documentation/jtag/jtag-summary.rst @@ -0,0 +1,47 @@ +.. SPDX-License-Identifier: GPL-2.0 + +==================================== +Linux kernel JTAG support +==================================== + +Introduction to JTAG +==================== + +JTAG is an industry standard for verifying hardware. JTAG provides access to +many logic signals of a complex integrated circuit, including the device pins. + +A JTAG interface is a special interface added to a chip. +Depending on the version of JTAG, two, four, or five pins are added. + +The connector pins are: + * TDI (Test Data In) + * TDO (Test Data Out) + * TCK (Test Clock) + * TMS (Test Mode Select) + * TRST (Test Reset) optional + +JTAG interface is designed to have two parts - basic core driver and +hardware specific driver. The basic driver introduces a general interface +which is not dependent of specific hardware. It provides communication +between user space and hardware specific driver. +Each JTAG device is represented as a char device from (jtag0, jtag1, ...). +Access to a JTAG device is performed through IOCTL calls. + +Call flow example: +:: + + User: open -> /dev/jatgX -> JTAG core driver -> JTAG hardware specific driver + User: ioctl -> /dev/jtagX -> JTAG core driver -> JTAG hardware specific driver + User: close -> /dev/jatgX -> JTAG core driver -> JTAG hardware specific driver + + +THANKS TO +--------- +Contributors to Linux-JTAG discussions include (in alphabetical order, +by last name): + +- Ernesto Corona +- Jiri Pirko +- Oleksandr Shamray +- Steven Filary +- Vadim Pasternak diff --git a/Documentation/jtag/jtagdev.rst b/Documentation/jtag/jtagdev.rst new file mode 100644 index 000000000000..445f0b9c5b4d --- /dev/null +++ b/Documentation/jtag/jtagdev.rst @@ -0,0 +1,194 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================== +JTAG userspace API +================== +JTAG master devices can be accessed through a character misc-device. + +Each JTAG master interface can be accessed by using /dev/jtagN. + +JTAG system calls set: + * SIR (Scan Instruction Register, IEEE 1149.1 Instruction Register scan); + * SDR (Scan Data Register, IEEE 1149.1 Data Register scan); + * RUNTEST (Forces the IEEE 1149.1 bus to a run state for a specified number of clocks. + +open(), close() +--------------- +Open/Close device: +:: + + jtag_fd = open("/dev/jtag0", O_RDWR); + close(jtag_fd); + +ioctl() +------- +All access operations to JTAG devices are performed through ioctl interface. +The IOCTL interface supports these requests: +:: + + JTAG_SIOCSTATE - Force JTAG state machine to go into a TAPC state + JTAG_SIOCFREQ - Set JTAG TCK frequency + JTAG_GIOCFREQ - Get JTAG TCK frequency + JTAG_IOCXFER - send/receive JTAG data Xfer + JTAG_GIOCSTATUS - get current JTAG TAP state + JTAG_SIOCMODE - set JTAG mode flags. + JTAG_IOCBITBANG - JTAG bitbang low level control. + +JTAG_SIOCFREQ +~~~~~~~~~~~~~ +Set JTAG clock speed: +:: + + unsigned int jtag_fd; + ioctl(jtag_fd, JTAG_SIOCFREQ, &frq); + +JTAG_GIOCFREQ +~~~~~~~~~~~~~ +Get JTAG clock speed: +:: + + unsigned int jtag_fd; + ioctl(jtag_fd, JTAG_GIOCFREQ, &frq); + +JTAG_SIOCSTATE +~~~~~~~~~~~~~~ +Force JTAG state machine to go into a TAPC state +:: + + struct jtag_end_tap_state { + __u8 reset; + __u8 endstate; + __u8 tck; + }; + +reset: one of below options +:: + + JTAG_NO_RESET - go through selected endstate from current state + JTAG_FORCE_RESET - go through TEST_LOGIC/RESET state before selected endstate + +endstate: any state listed in jtag_endstate enum +:: + + enum jtag_endstate { + JTAG_STATE_TLRESET, + JTAG_STATE_IDLE, + JTAG_STATE_SELECTDR, + JTAG_STATE_CAPTUREDR, + JTAG_STATE_SHIFTDR, + JTAG_STATE_EXIT1DR, + JTAG_STATE_PAUSEDR, + JTAG_STATE_EXIT2DR, + JTAG_STATE_UPDATEDR, + JTAG_STATE_SELECTIR, + JTAG_STATE_CAPTUREIR, + JTAG_STATE_SHIFTIR, + JTAG_STATE_EXIT1IR, + JTAG_STATE_PAUSEIR, + JTAG_STATE_EXIT2IR, + JTAG_STATE_UPDATEIR + }; + +tck: clock counter + +Example: +:: + + struct jtag_end_tap_state end_state; + + end_state.endstate = JTAG_STATE_IDLE; + end_state.reset = 0; + end_state.tck = data_p->tck; + usleep(25 * 1000); + ioctl(jtag_fd, JTAG_SIOCSTATE, &end_state); + +JTAG_GIOCSTATUS +~~~~~~~~~~~~~~~ +Get JTAG TAPC current machine state +:: + + unsigned int jtag_fd; + jtag_endstate endstate; + ioctl(jtag_fd, JTAG_GIOCSTATUS, &endstate); + +JTAG_IOCXFER +~~~~~~~~~~~~ +Send SDR/SIR transaction +:: + + struct jtag_xfer { + __u8 type; + __u8 direction; + __u8 endstate; + __u8 padding; + __u32 length; + __u64 tdio; + }; + +type: transfer type - JTAG_SIR_XFER/JTAG_SDR_XFER + +direction: xfer direction - JTAG_READ_XFER/JTAG_WRITE_XFER/JTAG_READ_WRITE_XFER + +length: xfer data length in bits + +tdio : xfer data array + +endstate: end state after transaction finish any of jtag_endstate enum + +Example: +:: + + struct jtag_xfer xfer; + static char buf[64]; + static unsigned int buf_len = 0; + [...] + xfer.type = JTAG_SDR_XFER; + xfer.tdio = (__u64)buf; + xfer.length = buf_len; + xfer.endstate = JTAG_STATE_IDLE; + + if (is_read) + xfer.direction = JTAG_READ_XFER; + else if (is_write) + xfer.direction = JTAG_WRITE_XFER; + else + xfer.direction = JTAG_READ_WRITE_XFER; + + ioctl(jtag_fd, JTAG_IOCXFER, &xfer); + +JTAG_SIOCMODE +~~~~~~~~~~~~~ +If hardware driver can support different running modes you can change it. + +Example: +:: + + struct jtag_mode mode; + mode.feature = JTAG_XFER_MODE; + mode.mode = JTAG_XFER_HW_MODE; + ioctl(jtag_fd, JTAG_SIOCMODE, &mode); + +JTAG_IOCBITBANG +~~~~~~~~~~~~~~~ +JTAG Bitbang low level operation. + +Example: +:: + + struct tck_bitbang bitbang + bitbang.tms = 1; + bitbang.tdi = 0; + ioctl(jtag_fd, JTAG_IOCBITBANG, &bitbang); + tdo = bitbang.tdo; + + +THANKS TO +--------- +Contributors to Linux-JTAG discussions include (in alphabetical order, +by last name): + +- Ernesto Corona +- Jiri Pirko +- Oleksandr Shamray +- Steven Filary +- Vadim Pasternak -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v29 4/6] Documentation: jtag: Add ABI documentation 2020-04-13 22:29 ` [PATCH v29 4/6] Documentation: jtag: Add ABI documentation Ernesto Corona @ 2021-01-19 12:01 ` Paul Fertser 0 siblings, 0 replies; 17+ messages in thread From: Paul Fertser @ 2021-01-19 12:01 UTC (permalink / raw) To: Ernesto Corona Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed, Arnd Bergmann, Jonathan Corbet, Jeffrey Hugo, Steven Filary, Linus Walleij, Vadim Pasternak, Amithash Prasad, Jiri Pirko, Rgrs, Manivannan Sadhasivam, Mauro Carvalho Chehab, Patrick Williams, Oleksandr Shamray Hello, This review of the proposed API was written after independently developing and testing on hardware (only SVF playback to configure a CPLD) support for OpenOCD[0]. I also include points that come to mind from my prior experience using wide range of JTAG adapters with different targets. On Mon, Apr 13, 2020 at 03:29:18PM -0700, Ernesto Corona wrote: > --- /dev/null > +++ b/Documentation/jtag/jtag-summary.rst > +A JTAG interface is a special interface added to a chip. > +Depending on the version of JTAG, two, four, or five pins are added. > + > +The connector pins are: > + * TDI (Test Data In) > + * TDO (Test Data Out) > + * TCK (Test Clock) > + * TMS (Test Mode Select) > + * TRST (Test Reset) optional Generic JTAG API should also include SRST (system reset), it's essential when JTAG is used as a transport for different On-Chip-Debug protocols. > +Call flow example: > +:: > + > + User: open -> /dev/jatgX -> JTAG core driver -> JTAG hardware specific driver > + User: ioctl -> /dev/jtagX -> JTAG core driver -> JTAG hardware specific driver > + User: close -> /dev/jatgX -> JTAG core driver -> JTAG hardware specific driver s/jatg/jtag/ Not sure about the semantics here, as open needs a filesystem path while the other two operations take a file descriptor. > --- /dev/null > +++ b/Documentation/jtag/jtagdev.rst > @@ -0,0 +1,194 @@ > +================== > +JTAG userspace API > +================== > +JTAG master devices can be accessed through a character misc-device. > + > +Each JTAG master interface can be accessed by using /dev/jtagN. > + > +JTAG system calls set: > + * SIR (Scan Instruction Register, IEEE 1149.1 Instruction Register scan); > + * SDR (Scan Data Register, IEEE 1149.1 Data Register scan); These two are handled with JTAG_IOCXFER ioctl. > + * RUNTEST (Forces the IEEE 1149.1 bus to a run state for a specified number of clocks. This should be handled by JTAG_SIOCSTATE ioctl, apparently. ioctl itself is a system call here, the items mentioned are just different arguments to it, AFAICT. > +JTAG_SIOCFREQ > +~~~~~~~~~~~~~ > +Set JTAG clock speed: > +:: > + > + unsigned int jtag_fd; > + ioctl(jtag_fd, JTAG_SIOCFREQ, &frq); The example defining jtag_fd looks confusing. Not only it is usually a bad idea to use unsigned int for a file descriptor (as open() returns a signed one that should be checked for errors), but in this example it's not assigned anything. And "frq" is not specified at all, so it's unclear what type it really should be, and what measurement units are supposed to be used. And I'm still not sure it needs to be a pointer. It's also unclear how a userspace should tell if the frequency was successfully set or if it was probably out of range for the specific adapter (the ioctl should return a documented error in this case). > +JTAG_SIOCSTATE > +~~~~~~~~~~~~~~ > +Force JTAG state machine to go into a TAPC state > +:: > + > + struct jtag_end_tap_state { > + __u8 reset; > + __u8 endstate; > + __u8 tck; Limiting tck to 255 maximum is unreasonable. > + }; > + > +reset: one of below options > +:: > + > + JTAG_NO_RESET - go through selected endstate from current state > + JTAG_FORCE_RESET - go through TEST_LOGIC/RESET state before selected endstate > + > +endstate: any state listed in jtag_endstate enum > +:: > + > + enum jtag_endstate { > + JTAG_STATE_TLRESET, > + JTAG_STATE_IDLE, > + JTAG_STATE_SELECTDR, > + JTAG_STATE_CAPTUREDR, > + JTAG_STATE_SHIFTDR, > + JTAG_STATE_EXIT1DR, > + JTAG_STATE_PAUSEDR, > + JTAG_STATE_EXIT2DR, > + JTAG_STATE_UPDATEDR, > + JTAG_STATE_SELECTIR, > + JTAG_STATE_CAPTUREIR, > + JTAG_STATE_SHIFTIR, > + JTAG_STATE_EXIT1IR, > + JTAG_STATE_PAUSEIR, > + JTAG_STATE_EXIT2IR, > + JTAG_STATE_UPDATEIR > + }; Even though there's no standard mapping between JTAG states and numbers, I would suggest to use the one documented by ARM[1] for their TAPSM register as was found in ARM7, ARM9 and other cores. Chances are that a userspace utility might have easier time converting between different encodings, at least it's the case for OpenOCD. > +tck: clock counter This is not nearly enough documentation for the parameter, IMHO. It doesn't work anyway in the current version so I had to add some bitbanging for CPLD configuration to work... > +Example: > +:: > + > + struct jtag_end_tap_state end_state; > + > + end_state.endstate = JTAG_STATE_IDLE; > + end_state.reset = 0; > + end_state.tck = data_p->tck; > + usleep(25 * 1000); > + ioctl(jtag_fd, JTAG_SIOCSTATE, &end_state); usleep doesn't seem to be doing anything useful at all here. > +JTAG_GIOCSTATUS > +~~~~~~~~~~~~~~~ > +Get JTAG TAPC current machine state > +:: > + > + unsigned int jtag_fd; > + jtag_endstate endstate; > + ioctl(jtag_fd, JTAG_GIOCSTATUS, &endstate); This should probably also include information about TRST and SRST states. > +JTAG_IOCXFER > +~~~~~~~~~~~~ > +Send SDR/SIR transaction > +:: > + > + struct jtag_xfer { > + __u8 type; > + __u8 direction; > + __u8 endstate; > + __u8 padding; padding is both undocumented and unused. > + __u32 length; > + __u64 tdio; > + }; > + > +type: transfer type - JTAG_SIR_XFER/JTAG_SDR_XFER > + > +direction: xfer direction - JTAG_READ_XFER/JTAG_WRITE_XFER/JTAG_READ_WRITE_XFER > + > +length: xfer data length in bits I'm not sure if calling it just "length" is clear enough. Probably a better name would be "bitcount"? > +tdio : xfer data array It's not exactly obvious that this is a pointer to user buffer containing data to be shifted out. Bit and byte order are not specified. I also do not like the idea to reuse input buffer for output. It might be const in the user app, it might be used after the JTAG operation for logging or verification purposes etc. Are there other popular APIs that do not split input and output into their own buffers? > +JTAG_SIOCMODE > +~~~~~~~~~~~~~ > +If hardware driver can support different running modes you can change it. > + > +Example: > +:: > + > + struct jtag_mode mode; > + mode.feature = JTAG_XFER_MODE; > + mode.mode = JTAG_XFER_HW_MODE; > + ioctl(jtag_fd, JTAG_SIOCMODE, &mode); This is absolutely not generic enough, and struct jtag_mode is just odd. And not documented here, the example is not extensive. Please consider providing instead a generic function to pass arbitrary data to the adapter driver _and_ to get some information back from it. > +JTAG_IOCBITBANG > +~~~~~~~~~~~~~~~ > +JTAG Bitbang low level operation. > + > +Example: > +:: > + > + struct tck_bitbang bitbang missing semicolon, missing declaration/documentation of the struct fields. > + bitbang.tms = 1; > + bitbang.tdi = 0; > + ioctl(jtag_fd, JTAG_IOCBITBANG, &bitbang); > + tdo = bitbang.tdo; This is ok, used it for implementing RUNTEST/STABLECLOCKS. Now follows the list of what I consider to be missing in this API if it's supposed to be generic enough to cover all regular JTAG devices: 1. Multiple devices might be used at the same time, including hotplugging. This requires methods to somehow enumerate them, read serial numbers, probably allow matching on VID:PID for USB adapters; some people also want to be able to match based on "location" (e.g. USB bus topology, full path leading to the device). 2. Bitbang-style control is often needed for SRST and TRST lines. 3. Many adapters have LED(s) that host software is supposed to control. 4. It'd be useful to have a way to emit a TMS sequence, e.g. modern ARM devices support both SWD and JTAG transports and a special sequence is needed to switch between them. [0] http://openocd.zylin.com/#/c/5975/ [1] https://documentation-service.arm.com/static/5e8e27fcfd977155116a637f -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v29 5/6] Documentation jtag: Add JTAG core driver ioctl number 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona ` (3 preceding siblings ...) 2020-04-13 22:29 ` [PATCH v29 4/6] Documentation: jtag: Add ABI documentation Ernesto Corona @ 2020-04-13 22:29 ` Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 6/6] drivers: jtag: Add JTAG core driver Maintainers Ernesto Corona 2021-01-15 10:46 ` [PATCH v29 0/6] JTAG driver introduction Paul Fertser 6 siblings, 0 replies; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Cc: Ernesto Corona, Oleksandr Shamray, Jonathan Corbet, Greg Kroah-Hartman, Gustavo Pimentel, Lorenzo Pieralisi, Kishon Vijay Abraham I, Darrick J . Wong, Bryant G . Ly, Eric Sandeen, Randy Dunlap, Tomohiro Kusumi, Arnd Bergmann, Mauro Carvalho Chehab, Alexandre Belloni, Theodore Ts'o, Eric Biggers, Steven Filary, Jiri Pirko, Vadim Pasternak, Amithash Prasad, Patrick Williams, Rgrs JTAG class driver provide infrastructure to support hardware/software JTAG platform drivers. It provide user layer API interface for flashing and debugging external devices which equipped with JTAG interface using standard transactions. Driver exposes set of IOCTL to user space for: - XFER: SIR (Scan Instruction Register, IEEE 1149.1 Data Register scan); SDR (Scan Data Register, IEEE 1149.1 Instruction Register scan); - GIOCSTATUS read the current TAPC state of the JTAG controller - SIOCSTATE Forces the JTAG TAPC to go into a particular state. - SIOCFREQ/GIOCFREQ for setting and reading JTAG frequency. - IOCBITBANG for low level control of JTAG signals. Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> Acked-by: Philippe Ombredanne <pombredanne@nexb.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Kishon Vijay Abraham I <kishon@ti.com> Cc: Darrick J. Wong <darrick.wong@oracle.com> Cc: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Cc: Eric Sandeen <sandeen@redhat.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Tomohiro Kusumi <kusumi.tomohiro@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Eric Biggers <ebiggers@google.com> Cc: Steven Filary <steven.a.filary@intel.com> Cc: Jiri Pirko <jiri@mellanox.com> Cc: Vadim Pasternak <vadimp@mellanox.com> Cc: Amithash Prasad <amithash@fb.com> Cc: Patrick Williams <patrickw3@fb.com> Cc: Rgrs <rgrs@protonmail.com> v28->v29 Move ioctl number to userspace-api/ioctl/ioctl-number.rst --- Documentation/userspace-api/ioctl/ioctl-number.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index f759edafd938..7c005fc9a1c2 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -332,6 +332,8 @@ Code Seq# Include File Comments <mailto:vgo@ratio.de> 0xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca> +0xB2 00-0F linux/jtag.h JTAG driver + <mailto:oleksandrs@mellanox.com> 0xB3 00 linux/mmc/ioctl.h 0xB4 00-0F linux/gpio.h <mailto:linux-gpio@vger.kernel.org> 0xB5 00-0F uapi/linux/rpmsg.h <mailto:linux-remoteproc@vger.kernel.org> -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v29 6/6] drivers: jtag: Add JTAG core driver Maintainers 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona ` (4 preceding siblings ...) 2020-04-13 22:29 ` [PATCH v29 5/6] Documentation jtag: Add JTAG core driver ioctl number Ernesto Corona @ 2020-04-13 22:29 ` Ernesto Corona 2020-04-14 9:15 ` Andy Shevchenko 2021-01-15 10:46 ` [PATCH v29 0/6] JTAG driver introduction Paul Fertser 6 siblings, 1 reply; 17+ messages in thread From: Ernesto Corona @ 2020-04-13 22:29 UTC (permalink / raw) To: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Cc: Ernesto Corona, Oleksandr Shamray, Jiri Pirko, Vadim Pasternak, Mauro Carvalho Chehab, Greg Kroah-Hartman, David S . Miller, Nicolas Ferre, Rob Herring, Andy Shevchenko, Lukas Bulwahn, Steven Filary, Amithash Prasad, Patrick Williams, Rgrs JTAG class driver provide infrastructure to support hardware/software JTAG platform drivers. It provide user layer API interface for flashing and debugging external devices which equipped with JTAG interface using standard transactions. Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Jiri Pirko <jiri@mellanox.com> Cc: Vadim Pasternak <vadimp@mellanox.com> Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: David S. Miller <davem@davemloft.net> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Rob Herring <robh@kernel.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com> Cc: Steven Filary <steven.a.filary@intel.com> Cc: Amithash Prasad <amithash@fb.com> Cc: Patrick Williams <patrickw3@fb.com> Cc: Rgrs <rgrs@protonmail.com> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e64e5db31497..96d20fbb719c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9144,6 +9144,17 @@ L: linux-serial@vger.kernel.org S: Orphan F: drivers/tty/serial/jsm/ +JTAG SUBSYSTEM +M: Oleksandr Shamray <oleksandrs@mellanox.com> +M: Vadim Pasternak <vadimp@mellanox.com> +M Ernesto Corona <ernesto.corona@intel.com> +S: Maintained +F: include/linux/jtag.h +F: include/uapi/linux/jtag.h +F: drivers/jtag/ +F: Documentation/devicetree/bindings/jtag/ +F: Documentation/ABI/testing/jtag-dev + K10TEMP HARDWARE MONITORING DRIVER M: Clemens Ladisch <clemens@ladisch.de> L: linux-hwmon@vger.kernel.org -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v29 6/6] drivers: jtag: Add JTAG core driver Maintainers 2020-04-13 22:29 ` [PATCH v29 6/6] drivers: jtag: Add JTAG core driver Maintainers Ernesto Corona @ 2020-04-14 9:15 ` Andy Shevchenko 0 siblings, 0 replies; 17+ messages in thread From: Andy Shevchenko @ 2020-04-14 9:15 UTC (permalink / raw) To: Ernesto Corona Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed, Oleksandr Shamray, Jiri Pirko, Vadim Pasternak, Mauro Carvalho Chehab, Greg Kroah-Hartman, David S . Miller, Nicolas Ferre, Rob Herring, Lukas Bulwahn, Steven Filary, Amithash Prasad, Patrick Williams, Rgrs On Mon, Apr 13, 2020 at 03:29:20PM -0700, Ernesto Corona wrote: > JTAG class driver provide infrastructure to support hardware/software > JTAG platform drivers. It provide user layer API interface for flashing > and debugging external devices which equipped with JTAG interface > using standard transactions. Don't forget to run scripts/parse-maintainers.pl --input=MAINTAINERS --output=MAINTAINERS --order > Signed-off-by: Oleksandr Shamray <oleksandrs@mellanox.com> > Signed-off-by: Ernesto Corona <ernesto.corona@intel.com> > Acked-by: Arnd Bergmann <arnd@arndb.de> > Cc: Jiri Pirko <jiri@mellanox.com> > Cc: Vadim Pasternak <vadimp@mellanox.com> > Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: David S. Miller <davem@davemloft.net> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com> > Cc: Steven Filary <steven.a.filary@intel.com> > Cc: Amithash Prasad <amithash@fb.com> > Cc: Patrick Williams <patrickw3@fb.com> > Cc: Rgrs <rgrs@protonmail.com> > --- > MAINTAINERS | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e64e5db31497..96d20fbb719c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -9144,6 +9144,17 @@ L: linux-serial@vger.kernel.org > S: Orphan > F: drivers/tty/serial/jsm/ > > +JTAG SUBSYSTEM > +M: Oleksandr Shamray <oleksandrs@mellanox.com> > +M: Vadim Pasternak <vadimp@mellanox.com> > +M Ernesto Corona <ernesto.corona@intel.com> > +S: Maintained > +F: include/linux/jtag.h > +F: include/uapi/linux/jtag.h > +F: drivers/jtag/ > +F: Documentation/devicetree/bindings/jtag/ > +F: Documentation/ABI/testing/jtag-dev > + > K10TEMP HARDWARE MONITORING DRIVER > M: Clemens Ladisch <clemens@ladisch.de> > L: linux-hwmon@vger.kernel.org > -- > 2.17.1 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v29 0/6] JTAG driver introduction 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona ` (5 preceding siblings ...) 2020-04-13 22:29 ` [PATCH v29 6/6] drivers: jtag: Add JTAG core driver Maintainers Ernesto Corona @ 2021-01-15 10:46 ` Paul Fertser 2021-04-06 13:22 ` Andy Shevchenko 6 siblings, 1 reply; 17+ messages in thread From: Paul Fertser @ 2021-01-15 10:46 UTC (permalink / raw) To: Ernesto Corona; +Cc: linux-doc, linux-kernel, linux-arm-kernel, linux-aspeed Hello, This is a multi-part review of the series, with general notes inline in this message, and specific points raised as replies to the individual patches. On Mon, Apr 13, 2020 at 03:29:14PM -0700, Ernesto Corona wrote: > We propose to implement general JTAG interface and infrastructure > to communicate with user layer application. Working with a Tioga Pass server platform I needed to use the JTAG master controller of an ASPEED AST2500 SoC to configure a Lattice LCMXO2-4000HC CPLD. I'm mentioning these fine details because that's the only proper runtime testing I performed, but my review is not limited to that. Being a long-time OpenOCD community member, I got familiar with many different facilities and protocols offered by hardware JTAG adapters, and of wide range of usecases as I was providing end-user support. This is my perspective when looking at these patches. I have to note that the current v29 version of the series is broken in several aspects: 1. The aspeed driver fails probe(), see the driver review for details; 2. The uapi include header is unusable; 3. The offered userspace implementation wasn't updated to the latest API, but even with the changes to make it compile it's still a mess too horrible to be used in production; Points 1 and 2 will be addressed in separate mails. To workaround point 3 I prepared a recipe with an additional patch[0] so that mlnx_cpldprog can be at least compiled and used for some minimal testing. The shortcomings of mlnx_cpldprog are numerous: 1. It doesn't consistently choose between hardware and bitbang modes; 2. Even though it checks TDO it doesn't print any errors on mismatch and continues playing back the SVF as if it's all right; 3. It has JTAG speed hardcoded; 4. It doesn't implement RUNTEST so with the CPLD I'm using it's always _not_ working properly, failing silently; 5. It is just awfully slow, taking about 40 minutes to play back a file that takes 1.5 minutes with OpenOCD with the same hardware and kernel driver. So I added support for the proposed API to OpenOCD: patch that applies to the version in OpenBMC[1], patch for the latest version[2]. And since it can do much more than just playing back SVF I hope this can highlight some essential API shortcomings if it's meant to be generic. My impression is that in its current state it's not adequate for the purpose. [0] https://bitbucket.org/paulfertser/mlnx_cpldprog_bitbake [1] http://openocd.zylin.com/#/c/5976/ [2] http://openocd.zylin.com/#/c/5975/ -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v29 0/6] JTAG driver introduction 2021-01-15 10:46 ` [PATCH v29 0/6] JTAG driver introduction Paul Fertser @ 2021-04-06 13:22 ` Andy Shevchenko 2021-04-06 13:34 ` Paul Fertser 0 siblings, 1 reply; 17+ messages in thread From: Andy Shevchenko @ 2021-04-06 13:22 UTC (permalink / raw) To: Paul Fertser Cc: Ernesto Corona, linux-aspeed, linux-kernel, linux-arm-kernel, linux-doc On Fri, Jan 15, 2021 at 01:46:35PM +0300, Paul Fertser wrote: > Hello, > > This is a multi-part review of the series, with general notes inline > in this message, and specific points raised as replies to the > individual patches. > > On Mon, Apr 13, 2020 at 03:29:14PM -0700, Ernesto Corona wrote: > > We propose to implement general JTAG interface and infrastructure > > to communicate with user layer application. > > Working with a Tioga Pass server platform I needed to use the JTAG > master controller of an ASPEED AST2500 SoC to configure a Lattice > LCMXO2-4000HC CPLD. I'm mentioning these fine details because that's > the only proper runtime testing I performed, but my review is not > limited to that. > > Being a long-time OpenOCD community member, I got familiar with many > different facilities and protocols offered by hardware JTAG adapters, > and of wide range of usecases as I was providing end-user > support. This is my perspective when looking at these patches. > > I have to note that the current v29 version of the series is broken in > several aspects: Is it correct that this series is actually abandoned so far? > 1. The aspeed driver fails probe(), see the driver review for details; > > 2. The uapi include header is unusable; > > 3. The offered userspace implementation wasn't updated to the latest > API, but even with the changes to make it compile it's still a mess > too horrible to be used in production; > > Points 1 and 2 will be addressed in separate mails. To workaround > point 3 I prepared a recipe with an additional patch[0] so that > mlnx_cpldprog can be at least compiled and used for some minimal > testing. > > The shortcomings of mlnx_cpldprog are numerous: > > 1. It doesn't consistently choose between hardware and bitbang modes; > > 2. Even though it checks TDO it doesn't print any errors on mismatch > and continues playing back the SVF as if it's all right; > > 3. It has JTAG speed hardcoded; > > 4. It doesn't implement RUNTEST so with the CPLD I'm using it's always > _not_ working properly, failing silently; > > 5. It is just awfully slow, taking about 40 minutes to play back a > file that takes 1.5 minutes with OpenOCD with the same hardware and > kernel driver. > > So I added support for the proposed API to OpenOCD: patch that applies > to the version in OpenBMC[1], patch for the latest version[2]. And > since it can do much more than just playing back SVF I hope this can > highlight some essential API shortcomings if it's meant to be > generic. My impression is that in its current state it's not adequate > for the purpose. > > [0] https://bitbucket.org/paulfertser/mlnx_cpldprog_bitbake > [1] http://openocd.zylin.com/#/c/5976/ > [2] http://openocd.zylin.com/#/c/5975/ -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v29 0/6] JTAG driver introduction 2021-04-06 13:22 ` Andy Shevchenko @ 2021-04-06 13:34 ` Paul Fertser 2021-04-06 17:00 ` Corona, Ernesto 0 siblings, 1 reply; 17+ messages in thread From: Paul Fertser @ 2021-04-06 13:34 UTC (permalink / raw) To: Andy Shevchenko Cc: Ernesto Corona, linux-aspeed, linux-kernel, linux-arm-kernel, linux-doc Hi Andy, On Tue, Apr 06, 2021 at 04:22:04PM +0300, Andy Shevchenko wrote: > On Fri, Jan 15, 2021 at 01:46:35PM +0300, Paul Fertser wrote: > > I have to note that the current v29 version of the series is broken in > > several aspects: > > Is it correct that this series is actually abandoned so far? I have an e-mail from Ernesto sent on 10 Feb 2021 stating they're going to continue the work. -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* RE: [PATCH v29 0/6] JTAG driver introduction 2021-04-06 13:34 ` Paul Fertser @ 2021-04-06 17:00 ` Corona, Ernesto 0 siblings, 0 replies; 17+ messages in thread From: Corona, Ernesto @ 2021-04-06 17:00 UTC (permalink / raw) To: Paul Fertser, Shevchenko, Andriy Cc: linux-aspeed, linux-kernel, linux-arm-kernel, linux-doc Hi All, Paul is right. We already have a v30 and now after Paul's feedback we are doing some changes in preparation for v31. Regards, Ernesto -----Original Message----- From: Paul Fertser <fercerpav@gmail.com> Sent: Tuesday, April 6, 2021 8:34 AM To: Shevchenko, Andriy <andriy.shevchenko@intel.com> Cc: Corona, Ernesto <ernesto.corona@intel.com>; linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-doc@vger.kernel.org Subject: Re: [PATCH v29 0/6] JTAG driver introduction Hi Andy, On Tue, Apr 06, 2021 at 04:22:04PM +0300, Andy Shevchenko wrote: > On Fri, Jan 15, 2021 at 01:46:35PM +0300, Paul Fertser wrote: > > I have to note that the current v29 version of the series is broken > > in several aspects: > > Is it correct that this series is actually abandoned so far? I have an e-mail from Ernesto sent on 10 Feb 2021 stating they're going to continue the work. -- Be free, use free (http://www.gnu.org/philosophy/free-sw.html) software! mailto:fercerpav@gmail.com ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-04-06 17:00 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-04-13 22:29 [PATCH v29 0/6] JTAG driver introduction Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 1/6] drivers: jtag: Add JTAG core driver Ernesto Corona 2021-01-15 11:18 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 2/6] dt-binding: jtag: Aspeed 2400 and 2500 series Ernesto Corona 2021-01-19 12:04 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 3/6] Add Aspeed SoC 24xx and 25xx families JTAG master driver Ernesto Corona 2020-09-28 2:17 ` Moritz Fischer 2021-01-15 11:53 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 4/6] Documentation: jtag: Add ABI documentation Ernesto Corona 2021-01-19 12:01 ` Paul Fertser 2020-04-13 22:29 ` [PATCH v29 5/6] Documentation jtag: Add JTAG core driver ioctl number Ernesto Corona 2020-04-13 22:29 ` [PATCH v29 6/6] drivers: jtag: Add JTAG core driver Maintainers Ernesto Corona 2020-04-14 9:15 ` Andy Shevchenko 2021-01-15 10:46 ` [PATCH v29 0/6] JTAG driver introduction Paul Fertser 2021-04-06 13:22 ` Andy Shevchenko 2021-04-06 13:34 ` Paul Fertser 2021-04-06 17:00 ` Corona, Ernesto
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).