0013-net-macb-Extend-MACB-driver-for-SiFive-Unleashed-boa.patch 4.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171
  1. From 896f4c50ef098c5ed430ed06a346d244f9fa7c4e Mon Sep 17 00:00:00 2001
  2. From: Anup Patel <anup.patel@wdc.com>
  3. Date: Wed, 19 Jun 2019 19:11:50 +0530
  4. Subject: [PATCH 13/21] net: macb: Extend MACB driver for SiFive Unleashed
  5. board
  6. The SiFive MACB ethernet has a custom TX_CLK_SEL register to select
  7. different TX clock for 1000mbps vs 10/100mbps.
  8. This patch adds SiFive MACB compatible string and extends the MACB
  9. ethernet driver to change TX clock using TX_CLK_SEL register for
  10. SiFive MACB.
  11. Signed-off-by: Anup Patel <anup.patel@wdc.com>
  12. Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
  13. Upstream-Status: Submitted
  14. ---
  15. drivers/net/macb.c | 70 +++++++++++++++++++++++++++++++++++-----------
  16. 1 file changed, 53 insertions(+), 17 deletions(-)
  17. diff --git a/drivers/net/macb.c b/drivers/net/macb.c
  18. index c072f99d8f..322302762a 100644
  19. --- a/drivers/net/macb.c
  20. +++ b/drivers/net/macb.c
  21. @@ -83,7 +83,8 @@ struct macb_dma_desc {
  22. struct macb_device {
  23. void *regs;
  24. - unsigned int dma_burst_length;
  25. +
  26. + const struct macb_config*config;
  27. unsigned int rx_tail;
  28. unsigned int tx_head;
  29. @@ -123,6 +124,8 @@ struct macb_device {
  30. struct macb_config {
  31. unsigned int dma_burst_length;
  32. +
  33. + int (*clk_init)(struct udevice *dev, ulong rate);
  34. };
  35. #ifndef CONFIG_DM_ETH
  36. @@ -483,21 +486,38 @@ static int macb_phy_find(struct macb_device *macb, const char *name)
  37. * when operation failed.
  38. */
  39. #ifdef CONFIG_DM_ETH
  40. +static int macb_sifive_clk_init(struct udevice *dev, ulong rate)
  41. +{
  42. + fdt_addr_t addr;
  43. + void *gemgxl_regs;
  44. +
  45. + addr = dev_read_addr_index(dev, 1);
  46. + if (addr == FDT_ADDR_T_NONE)
  47. + return -ENODEV;
  48. +
  49. + gemgxl_regs = (void __iomem *)addr;
  50. + if (!gemgxl_regs)
  51. + return -ENODEV;
  52. +
  53. + /*
  54. + * SiFive GEMGXL TX clock operation mode:
  55. + *
  56. + * 0 = GMII mode. Use 125 MHz gemgxlclk from PRCI in TX logic
  57. + * and output clock on GMII output signal GTX_CLK
  58. + * 1 = MII mode. Use MII input signal TX_CLK in TX logic
  59. + */
  60. + writel(rate != 125000000, gemgxl_regs);
  61. + return 0;
  62. +}
  63. +
  64. int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed)
  65. {
  66. #ifdef CONFIG_CLK
  67. + struct macb_device *macb = dev_get_priv(dev);
  68. struct clk tx_clk;
  69. ulong rate;
  70. int ret;
  71. - /*
  72. - * "tx_clk" is an optional clock source for MACB.
  73. - * Ignore if it does not exist in DT.
  74. - */
  75. - ret = clk_get_by_name(dev, "tx_clk", &tx_clk);
  76. - if (ret)
  77. - return 0;
  78. -
  79. switch (speed) {
  80. case _10BASET:
  81. rate = 2500000; /* 2.5 MHz */
  82. @@ -513,6 +533,17 @@ int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed)
  83. return 0;
  84. }
  85. + if (macb->config->clk_init)
  86. + return macb->config->clk_init(dev, rate);
  87. +
  88. + /*
  89. + * "tx_clk" is an optional clock source for MACB.
  90. + * Ignore if it does not exist in DT.
  91. + */
  92. + ret = clk_get_by_name(dev, "tx_clk", &tx_clk);
  93. + if (ret)
  94. + return 0;
  95. +
  96. if (tx_clk.dev) {
  97. ret = clk_set_rate(&tx_clk, rate);
  98. if (ret)
  99. @@ -705,8 +736,9 @@ static void gmac_configure_dma(struct macb_device *macb)
  100. dmacfg = gem_readl(macb, DMACFG) & ~GEM_BF(RXBS, -1L);
  101. dmacfg |= GEM_BF(RXBS, buffer_size);
  102. - if (macb->dma_burst_length)
  103. - dmacfg = GEM_BFINS(FBLDO, macb->dma_burst_length, dmacfg);
  104. + if (macb->config->dma_burst_length)
  105. + dmacfg = GEM_BFINS(FBLDO,
  106. + macb->config->dma_burst_length, dmacfg);
  107. dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L);
  108. dmacfg &= ~GEM_BIT(ENDIA_PKT);
  109. @@ -1173,11 +1205,10 @@ static const struct macb_config default_gem_config = {
  110. static int macb_eth_probe(struct udevice *dev)
  111. {
  112. - const struct macb_config *macb_config;
  113. struct eth_pdata *pdata = dev_get_platdata(dev);
  114. struct macb_device *macb = dev_get_priv(dev);
  115. const char *phy_mode;
  116. - __maybe_unused int ret;
  117. + int ret;
  118. phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
  119. NULL);
  120. @@ -1190,11 +1221,10 @@ static int macb_eth_probe(struct udevice *dev)
  121. macb->regs = (void *)pdata->iobase;
  122. - macb_config = (struct macb_config *)dev_get_driver_data(dev);
  123. - if (!macb_config)
  124. - macb_config = &default_gem_config;
  125. + macb->config = (struct macb_config *)dev_get_driver_data(dev);
  126. + if (!macb->config)
  127. + macb->config = &default_gem_config;
  128. - macb->dma_burst_length = macb_config->dma_burst_length;
  129. #ifdef CONFIG_CLK
  130. ret = macb_enable_clk(dev);
  131. if (ret)
  132. @@ -1259,6 +1289,11 @@ static const struct macb_config sama5d4_config = {
  133. .dma_burst_length = 4,
  134. };
  135. +static const struct macb_config sifive_config = {
  136. + .dma_burst_length = 16,
  137. + .clk_init = macb_sifive_clk_init,
  138. +};
  139. +
  140. static const struct udevice_id macb_eth_ids[] = {
  141. { .compatible = "cdns,macb" },
  142. { .compatible = "cdns,at91sam9260-macb" },
  143. @@ -1266,6 +1301,7 @@ static const struct udevice_id macb_eth_ids[] = {
  144. { .compatible = "atmel,sama5d3-gem" },
  145. { .compatible = "atmel,sama5d4-gem", .data = (ulong)&sama5d4_config },
  146. { .compatible = "cdns,zynq-gem" },
  147. + { .compatible = "sifive,fu540-macb", .data = (ulong)&sifive_config },
  148. { }
  149. };
  150. --
  151. 2.22.0