Re: [Qemu-devel] [PATCH v5 2/7] hw/mdio: Add PHY register definition

[Alistair Francis]

On Fri, Sep 22, 2017 at 10:13 AM, Philippe Mathieu-Daudé
<address@hidden> wrote:
> From: Grant Likely <address@hidden>
>
> Trivial patch to add #defines for defined PHY register address and bit fields
>
> Signed-off-by: Grant Likely <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  include/hw/net/mdio.h | 24 ++++++++++++++++++++++--
>  hw/net/mdio.c         |  8 ++++----
>  2 files changed, 26 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/net/mdio.h b/include/hw/net/mdio.h
> index ac36aed3c3..7ffa4389b9 100644
> --- a/include/hw/net/mdio.h
> +++ b/include/hw/net/mdio.h
> @@ -25,14 +25,34 @@
>   * THE SOFTWARE.
>   */
>
> -/* 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;
>
> diff --git a/hw/net/mdio.c b/hw/net/mdio.c
> index 3763fcc8af..3d70d99077 100644
> --- a/hw/net/mdio.c
> +++ b/hw/net/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;
> --
> 2.14.1
>
>