From patchwork Sat Feb 2 23:40:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 217715 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E5F42C0094 for ; Sun, 3 Feb 2013 11:08:00 +1100 (EST) Received: from localhost ([::1]:49531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1mi6-0003k6-Pc for incoming@patchwork.ozlabs.org; Sat, 02 Feb 2013 18:41:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1mh4-0001Ez-KE for qemu-devel@nongnu.org; Sat, 02 Feb 2013 18:40:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1mh2-0000oB-5W for qemu-devel@nongnu.org; Sat, 02 Feb 2013 18:40:22 -0500 Received: from mail-wi0-f181.google.com ([209.85.212.181]:65100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1mh1-0000o7-W6 for qemu-devel@nongnu.org; Sat, 02 Feb 2013 18:40:20 -0500 Received: by mail-wi0-f181.google.com with SMTP id hm6so515648wib.2 for ; Sat, 02 Feb 2013 15:40:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=TwvnqqmByi0uNma0vMQLgKu7r3JgwfGUh5sUrMEvltY=; b=iFoJqb0UEfG3vFH4GmKeeXTO76UIExyH3iioGVRV5ei4LsMWBwdB4L1AlGVAwOxhsZ WGMjyRHo80N3kE2UET0mANgioJhLr+QZxZtOie4nW8SATa03bUrkPf5wEgkO81rKv423 JMXp/G9+UEy3+26374PnajsG4ft6sisz+PGj3ECjL/CQGgCx3cPvRkB0Pga/yl8ZxowC 5kfbW/oyXVhBz+Z6Vy2Cf8CLb5GLw+ihQeElZa9LCkfrW4pNAnslLL6LblQ4r3HRTHiG R6wbtrRJjycAkTFyjOY/0bfcgLNC9FTQB6wRp2/MPksHvwAzGssGrz80Vn9podFJlQpL 61Pg== X-Received: by 10.194.89.167 with SMTP id bp7mr28282762wjb.0.1359848419156; Sat, 02 Feb 2013 15:40:19 -0800 (PST) Received: from localhost (host86-136-235-200.range86-136.btcentralplus.com. [86.136.235.200]) by mx.google.com with ESMTPS id s8sm11818849wif.9.2013.02.02.15.40.17 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 02 Feb 2013 15:40:18 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id CE54A3E0D50; Sat, 2 Feb 2013 23:40:15 +0000 (GMT) From: Grant Likely To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2013 23:40:04 +0000 Message-Id: <1359848409-1106-4-git-send-email-grant.likely@secretlab.ca> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359848409-1106-1-git-send-email-grant.likely@secretlab.ca> References: <1359848409-1106-1-git-send-email-grant.likely@secretlab.ca> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkQPe/iSxqL4v29zvTpQfelFaDnVc6YCA7jnJfjrNQ25yZFnY4Dkn0aJObqsrI5gSZjwV7K X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.212.181 Cc: Peter Maydell , Anthony Liguori , Grant Likely , Paul Brook , "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH V3 3/8] hw/mdio: Add PHY register definition X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Trivial patch to add #defines for defined PHY register address and bit fields Cc: Peter Maydell Cc: Paul Brook Cc: Edgar E. Iglesias Cc: Anthony Liguori Cc: Andreas Färber Signed-off-by: Grant Likely --- hw/mdio.c | 8 ++++---- hw/mdio.h | 24 ++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/hw/mdio.c b/hw/mdio.c index 8328b9b..e5e30b6 100644 --- a/hw/mdio.c +++ b/hw/mdio.c @@ -122,12 +122,12 @@ static void tdk_write(struct qemu_phy *phy, unsigned int req, unsigned int data) void tdk_init(struct qemu_phy *phy) { - phy->regs[0] = 0x3100; + phy->regs[PHY_CTRL] = 0x3100; /* PHY Id. */ - phy->regs[2] = 0x0300; - phy->regs[3] = 0xe400; + phy->regs[PHY_ID1] = 0x0300; + phy->regs[PHY_ID2] = 0xe400; /* Autonegotiation advertisement reg. */ - phy->regs[4] = 0x01e1; + phy->regs[PHY_AUTONEG_ADV] = 0x01e1; phy->link = 1; phy->read = tdk_read; diff --git a/hw/mdio.h b/hw/mdio.h index 9f29912..0ba92cd 100644 --- a/hw/mdio.h +++ b/hw/mdio.h @@ -27,14 +27,34 @@ #include -/* PHY Advertisement control register */ +/* PHY MII Register/Bit Definitions */ +/* PHY Registers defined by IEEE */ +#define PHY_CTRL 0x00 /* Control Register */ +#define PHY_STATUS 0x01 /* Status Regiser */ +#define PHY_ID1 0x02 /* Phy Id Reg (word 1) */ +#define PHY_ID2 0x03 /* Phy Id Reg (word 2) */ +#define PHY_AUTONEG_ADV 0x04 /* Autoneg Advertisement */ +#define PHY_LP_ABILITY 0x05 /* Link Partner Ability (Base Page) */ +#define PHY_AUTONEG_EXP 0x06 /* Autoneg Expansion Reg */ +#define PHY_NEXT_PAGE_TX 0x07 /* Next Page TX */ +#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */ +#define PHY_1000T_CTRL 0x09 /* 1000Base-T Control Reg */ +#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */ +#define PHY_EXT_STATUS 0x0F /* Extended Status Reg */ + +#define NUM_PHY_REGS 0x20 /* 5 bit address bus (0-0x1F) */ + +#define PHY_CTRL_RST 0x8000 /* PHY reset command */ +#define PHY_CTRL_ANEG_RST 0x0200 /* Autonegotiation reset command */ + +/* PHY Advertisement control and remote capability registers (same bitfields) */ #define PHY_ADVERTISE_10HALF 0x0020 /* Try for 10mbps half-duplex */ #define PHY_ADVERTISE_10FULL 0x0040 /* Try for 10mbps full-duplex */ #define PHY_ADVERTISE_100HALF 0x0080 /* Try for 100mbps half-duplex */ #define PHY_ADVERTISE_100FULL 0x0100 /* Try for 100mbps full-duplex */ struct qemu_phy { - uint32_t regs[32]; + uint32_t regs[NUM_PHY_REGS]; int link;