From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnUS4-0003cs-Fb for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnUS3-0002eF-6w for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:54:04 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:55364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnUS3-0002e9-39 for qemu-devel@nongnu.org; Fri, 14 Jun 2013 09:54:03 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Jun 2013 09:54:02 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id DD73938C8051 for ; Fri, 14 Jun 2013 09:53:58 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5EDrx6m341224 for ; Fri, 14 Jun 2013 09:53:59 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5EDrwYL018861 for ; Fri, 14 Jun 2013 10:53:59 -0300 From: Anthony Liguori In-Reply-To: <1371208516-7857-16-git-send-email-armbru@redhat.com> References: <1371208516-7857-1-git-send-email-armbru@redhat.com> <1371208516-7857-16-git-send-email-armbru@redhat.com> Date: Fri, 14 Jun 2013 08:53:50 -0500 Message-ID: <8761xgg5n5.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH v3 15/16] boot-order-test: Support fw_cfg in I/O space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: Blue Swirl , jan.kiszka@siemens.com, alex.williamson@redhat.com, afaerber@suse.de, aviksil@linux.vnet.ibm.com Markus Armbruster writes: > Next commit needs it. > > Cc: Blue Swirl > Signed-off-by: Markus Armbruster > --- > tests/boot-order-test.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c > index 7b1edc1..d1d99f8 100644 > --- a/tests/boot-order-test.c > +++ b/tests/boot-order-test.c > @@ -133,23 +133,31 @@ static void test_prep_boot_order(void) > test_boot_orders("prep", read_boot_order_prep, test_cases_prep); > } > > -static void read_fw_cfg(uint64_t cfg_addr, uint16_t cmd, > +static void read_fw_cfg(uint64_t cfg_addr, bool addr_is_io, uint16_t cmd, > void *buf, size_t len) I missed it earlier, but you can use libqos/fw_cfg.h for this. Regards, Anthony Liguori > { > uint8_t *p = buf; > size_t i; > > - writew(cfg_addr, cmd); > - for (i = 0; i < len; i++) { > - p[i] = readb(cfg_addr + 2); > + if (addr_is_io) { > + outw(cfg_addr, cmd); > + for (i = 0; i < len; i++) { > + p[i] = inb(cfg_addr + 1); > + } > + } else { > + writew(cfg_addr, cmd); > + for (i = 0; i < len; i++) { > + p[i] = readb(cfg_addr + 2); > + } > } > } > > -static uint16_t read_fw_cfg_i16(uint64_t cfg_addr, uint16_t cmd) > +static uint16_t read_fw_cfg_i16(uint64_t cfg_addr, bool addr_is_io, > + uint16_t cmd) > { > uint16_t value; > > - read_fw_cfg(cfg_addr, cmd, &value, sizeof(value)); > + read_fw_cfg(cfg_addr, addr_is_io, cmd, &value, sizeof(value)); > return le16_to_cpu(value); > } > > @@ -157,7 +165,7 @@ static uint16_t read_fw_cfg_i16(uint64_t cfg_addr, uint16_t cmd) > > static uint64_t read_boot_order_pmac(void) > { > - return read_fw_cfg_i16(PMAC_CFG_ADDR, FW_CFG_BOOT_DEVICE); > + return read_fw_cfg_i16(PMAC_CFG_ADDR, false, FW_CFG_BOOT_DEVICE); > } > > static const boot_order_test test_cases_fw_cfg[] = { > @@ -182,7 +190,7 @@ static void test_pmac_newworld_boot_order(void) > > static uint64_t read_boot_order_sun4m(void) > { > - return read_fw_cfg_i16(SUN4M_CFG_ADDR, FW_CFG_BOOT_DEVICE); > + return read_fw_cfg_i16(SUN4M_CFG_ADDR, false, FW_CFG_BOOT_DEVICE); > } > > static void test_sun4m_boot_order(void) > -- > 1.7.11.7