From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGPpZ-0000XX-9g for qemu-devel@nongnu.org; Wed, 28 Jan 2015 05:26:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGPpU-0000vu-9z for qemu-devel@nongnu.org; Wed, 28 Jan 2015 05:26:41 -0500 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:50243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGPpU-0000vm-0A for qemu-devel@nongnu.org; Wed, 28 Jan 2015 05:26:36 -0500 Received: by mail-wi0-f170.google.com with SMTP id bs8so2320904wib.1 for ; Wed, 28 Jan 2015 02:26:35 -0800 (PST) Sender: Paolo Bonzini Message-ID: <54C8B958.5040301@redhat.com> Date: Wed, 28 Jan 2015 11:26:32 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1421698563-6977-1-git-send-email-jsnow@redhat.com> <1421698563-6977-13-git-send-email-jsnow@redhat.com> In-Reply-To: <1421698563-6977-13-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 12/15] libqos/ahci: Functional register helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com On 19/01/2015 21:16, John Snow wrote: > Introduce a set of "static inline" register helpers that are intended to > replace the current set of macros with more functional versions that are > better suited to inclusion in libqos than porcelain macros. > > As a stopgap measure before eliminating the porcelain macros, define them > to use the new functions defined in the ahci.h header. > > Signed-off-by: John Snow > --- > tests/ahci-test.c | 25 ++++++++++----------- > tests/libqos/ahci.h | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 74 insertions(+), 14 deletions(-) > > diff --git a/tests/ahci-test.c b/tests/ahci-test.c > index bb98968..25e54b8 100644 > --- a/tests/ahci-test.c > +++ b/tests/ahci-test.c > @@ -47,22 +47,19 @@ static char tmp_path[] = "/tmp/qtest.XXXXXX"; > static bool ahci_pedantic; > > /*** IO macros for the AHCI memory registers. ***/ > -#define AHCI_READ(OFST) qpci_io_readl(ahci->dev, ahci->hba_base + (OFST)) > -#define AHCI_WRITE(OFST, VAL) qpci_io_writel(ahci->dev, \ > - ahci->hba_base + (OFST), (VAL)) > -#define AHCI_RREG(regno) AHCI_READ(4 * (regno)) > -#define AHCI_WREG(regno, val) AHCI_WRITE(4 * (regno), (val)) > -#define AHCI_SET(regno, mask) AHCI_WREG((regno), AHCI_RREG(regno) | (mask)) > -#define AHCI_CLR(regno, mask) AHCI_WREG((regno), AHCI_RREG(regno) & ~(mask)) > +#define AHCI_READ(OFST) ahci_mread(ahci, (OFST)) > +#define AHCI_WRITE(OFST, VAL) ahci_mwrite(ahci, (OFST), (VAL)) > +#define AHCI_RREG(regno) ahci_rreg(ahci, (regno)) > +#define AHCI_WREG(regno, val) ahci_wreg(ahci, (regno), (val)) > +#define AHCI_SET(regno, mask) ahci_set(ahci, (regno), (mask)) > +#define AHCI_CLR(regno, mask) ahci_clr(ahci, (regno), (mask)) > > /*** IO macros for port-specific offsets inside of AHCI memory. ***/ > -#define PX_OFST(port, regno) (HBA_PORT_NUM_REG * (port) + AHCI_PORTS + (regno)) > -#define PX_RREG(port, regno) AHCI_RREG(PX_OFST((port), (regno))) > -#define PX_WREG(port, regno, val) AHCI_WREG(PX_OFST((port), (regno)), (val)) > -#define PX_SET(port, reg, mask) PX_WREG((port), (reg), \ > - PX_RREG((port), (reg)) | (mask)); > -#define PX_CLR(port, reg, mask) PX_WREG((port), (reg), \ > - PX_RREG((port), (reg)) & ~(mask)); > +#define PX_OFST(port, regno) ahci_px_ofst((port), (regno)) > +#define PX_RREG(port, regno) ahci_px_rreg(ahci, (port), (regno)) > +#define PX_WREG(port, regno, val) ahci_px_wreg(ahci, (port), (regno), (val)) > +#define PX_SET(port, reg, mask) ahci_px_set(ahci, (port), (reg), (mask)) > +#define PX_CLR(port, reg, mask) ahci_px_clr(ahci, (port), (reg), (mask)) > > /*** Function Declarations ***/ > static QPCIDevice *get_ahci_device(uint32_t *fingerprint); > diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h > index 8e92385..645f05b 100644 > --- a/tests/libqos/ahci.h > +++ b/tests/libqos/ahci.h > @@ -354,4 +354,67 @@ typedef struct PRD { > /* For calculating how big the PRD table needs to be: */ > #define CMD_TBL_SIZ(n) ((0x80 + ((n) * sizeof(PRD)) + 0x7F) & ~0x7F) > > +/* Helpers for reading/writing AHCI HBA register values */ > + > +static inline uint32_t ahci_mread(AHCIQState *ahci, size_t offset) > +{ > + return qpci_io_readl(ahci->dev, ahci->hba_base + offset); > +} > + > +static inline void ahci_mwrite(AHCIQState *ahci, size_t offset, uint32_t value) > +{ > + qpci_io_writel(ahci->dev, ahci->hba_base + offset, value); > +} > + > +static inline uint32_t ahci_rreg(AHCIQState *ahci, uint32_t reg_num) > +{ > + return ahci_mread(ahci, 4 * reg_num); > +} > + > +static inline void ahci_wreg(AHCIQState *ahci, uint32_t reg_num, uint32_t value) > +{ > + ahci_mwrite(ahci, 4 * reg_num, value); > +} > + > +static inline void ahci_set(AHCIQState *ahci, uint32_t reg_num, uint32_t mask) > +{ > + ahci_wreg(ahci, reg_num, ahci_rreg(ahci, reg_num) | mask); > +} > + > +static inline void ahci_clr(AHCIQState *ahci, uint32_t reg_num, uint32_t mask) > +{ > + ahci_wreg(ahci, reg_num, ahci_rreg(ahci, reg_num) & ~mask); > +} > + > +static inline size_t ahci_px_offset(uint8_t port, uint32_t reg_num) > +{ > + return AHCI_PORTS + (HBA_PORT_NUM_REG * port) + reg_num; > +} > + > +static inline uint32_t ahci_px_rreg(AHCIQState *ahci, uint8_t port, > + uint32_t reg_num) > +{ > + return ahci_rreg(ahci, ahci_px_offset(port, reg_num)); > +} > + > +static inline void ahci_px_wreg(AHCIQState *ahci, uint8_t port, > + uint32_t reg_num, uint32_t value) > +{ > + ahci_wreg(ahci, ahci_px_offset(port, reg_num), value); > +} > + > +static inline void ahci_px_set(AHCIQState *ahci, uint8_t port, > + uint32_t reg_num, uint32_t mask) > +{ > + ahci_px_wreg(ahci, port, reg_num, > + ahci_px_rreg(ahci, port, reg_num) | mask); > +} > + > +static inline void ahci_px_clr(AHCIQState *ahci, uint8_t port, > + uint32_t reg_num, uint32_t mask) > +{ > + ahci_px_wreg(ahci, port, reg_num, > + ahci_px_rreg(ahci, port, reg_num) & ~mask); > +} > + > #endif > Reviewed-by: Paolo Bonzini