| Message ID | 1354754807-21449-16-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Dec 5, 2012 at 10:46 PM, Simon Glass <sjg@chromium.org> wrote: > From: Vadim Bendebury <vbendeb@chromium.org> > > Provide u-boot console functions to access IO space registers. A no > thrills implementation, accessing one register at a time. > > For example: > boot > iod 80 > 0080: 00000094 > boot > iod.w 80 > 0080: 0094 > boot > iod.b 80 > 0080: 94 > boot > iow.b 0x80 12 > boot > iod 0x80 > 0080: 00000012 Doesn't md/mw accomplish the same? Regards, Fabio Estevam
On Wed, Dec 5, 2012 at 5:23 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Wed, Dec 5, 2012 at 10:46 PM, Simon Glass <sjg@chromium.org> wrote: >> From: Vadim Bendebury <vbendeb@chromium.org> >> >> Provide u-boot console functions to access IO space registers. A no >> thrills implementation, accessing one register at a time. >> >> For example: >> boot > iod 80 >> 0080: 00000094 >> boot > iod.w 80 >> 0080: 0094 >> boot > iod.b 80 >> 0080: 94 >> boot > iow.b 0x80 12 >> boot > iod 0x80 >> 0080: 00000012 > > Doesn't md/mw accomplish the same? > No - md/mw access memory, the new commands access the IO space (which is an x86 architecture property). cheers, /vb > Regards, > > Fabio Estevam
On Wed, Dec 5, 2012 at 11:25 PM, Vadim Bendebury <vbendeb@chromium.org> wrote: > No - md/mw access memory, the new commands access the IO space (which > is an x86 architecture property). Ok, understood. On ARM we are able to access registers via md/mw. Maybe it would be better to put a note in the commit message that this is x86 specific. Regards, Fabio Estevam
Hi Fabio, On Wed, Dec 5, 2012 at 5:30 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Wed, Dec 5, 2012 at 11:25 PM, Vadim Bendebury <vbendeb@chromium.org> wrote: > >> No - md/mw access memory, the new commands access the IO space (which >> is an x86 architecture property). > > Ok, understood. On ARM we are able to access registers via md/mw. > > Maybe it would be better to put a note in the commit message that this > is x86 specific. Yes I put it an x86: tag on it for the next version. I have not added any x86 note in the README - in fact this is sadly missing a README comment. Regards, Simon > > Regards, > > Fabio Estevam
On Sat, Dec 08, 2012 at 11:54:13AM -0800, Simon Glass wrote: > Hi Fabio, > > On Wed, Dec 5, 2012 at 5:30 PM, Fabio Estevam <festevam@gmail.com> wrote: > > On Wed, Dec 5, 2012 at 11:25 PM, Vadim Bendebury <vbendeb@chromium.org> wrote: > > > >> No - md/mw access memory, the new commands access the IO space (which > >> is an x86 architecture property). > > > > Ok, understood. On ARM we are able to access registers via md/mw. > > > > Maybe it would be better to put a note in the commit message that this > > is x86 specific. > > Yes I put it an x86: tag on it for the next version. I have not added > any x86 note in the README - in fact this is sadly missing a README > comment. Please address adding to the README in another patch, thanks!
diff --git a/common/Makefile b/common/Makefile index dcab027..1c5d623 100644 --- a/common/Makefile +++ b/common/Makefile @@ -120,6 +120,7 @@ COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o COBJS-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o +COBJS-$(CONFIG_CMD_IO) += cmd_io.o COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o COBJS-$(CONFIG_MII) += miiphyutil.o COBJS-$(CONFIG_CMD_MII) += miiphyutil.o diff --git a/common/cmd_io.c b/common/cmd_io.c new file mode 100644 index 0000000..6450cb5 --- /dev/null +++ b/common/cmd_io.c @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2012 The Chromium OS Authors. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* + * IO space access commands. + */ + +#include <common.h> +#include <command.h> +#include <asm/io.h> + +/* + * IO Display + * + * Syntax: + * iod{.b, .w, .l} {addr} + */ +int do_io_iod(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + ulong addr; + int size; + + if (argc != 2) + return CMD_RET_USAGE; + + size = cmd_get_data_size(argv[0], 4); + if (size < 0) + return 1; + + addr = simple_strtoul(argv[1], NULL, 16); + + printf("%04x: ", (u16) addr); + + if (size == 4) + printf("%08x\n", inl(addr)); + else if (size == 2) + printf("%04x\n", inw(addr)); + else + printf("%02x\n", inb(addr)); + + return 0; +} + +int do_io_iow(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + ulong addr, size, val; + + if (argc != 3) + return CMD_RET_USAGE; + + size = cmd_get_data_size(argv[0], 4); + if (size < 0) + return 1; + + addr = simple_strtoul(argv[1], NULL, 16); + val = simple_strtoul(argv[2], NULL, 16); + + if (size == 4) + outl((u32) val, addr); + else if (size == 2) + outw((u16) val, addr); + else + outb((u8) val, addr); + + return 0; +} + +/**************************************************/ +U_BOOT_CMD(iod, 2, 0, do_io_iod, + "IO space display", "[.b, .w, .l] address [# of objects]"); + +U_BOOT_CMD(iow, 3, 0, do_io_iow, + "IO space modify (auto-incrementing address)", + "[.b, .w, .l] address"); diff --git a/include/command.h b/include/command.h index 10bc260..476e7cf 100644 --- a/include/command.h +++ b/include/command.h @@ -89,10 +89,10 @@ extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int * */ #if defined(CONFIG_CMD_MEMORY) \ - || defined(CONFIG_CMD_I2C) \ - || defined(CONFIG_CMD_ITEST) \ - || defined(CONFIG_CMD_PCI) \ - || defined(CONFIG_CMD_PORTIO) + || defined(CONFIG_CMD_I2C) \ + || defined(CONFIG_CMD_ITEST) \ + || defined(CONFIG_CMD_PCI) \ + || defined(CONFIG_CMD_PORTIO) #define CMD_DATA_SIZE extern int cmd_get_data_size(char* arg, int default_size); #endif diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 124d51f..e82f642 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -48,6 +48,7 @@ #define CONFIG_CMD_IMI /* iminfo */ #define CONFIG_CMD_IMLS /* List all found images */ #define CONFIG_CMD_IMMAP /* IMMR dump support */ +#define CONFIG_CMD_IO /* Access to X86 IO space */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_ITEST /* Integer (and string) test */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */