target/linux/ath79/patches-5.10/930-ar8216-make-reg-access-atomic.patch

   1 From b3797d1a92afe97c173b00fdb7824cedba24eef0 Mon Sep 17 00:00:00 2001
   2 From: Chuanhong Guo <gch981213@gmail.com>
   3 Date: Sun, 20 Sep 2020 01:00:45 +0800
   4 Subject: [PATCH] ath79: ar8216: make switch register access atomic
   5
   6 due to some unknown reason these register accesses sometimes fail
   7 on the integrated switch without this patch.
   8
   9 THIS ONLY WORKS ON ATH79 AND MAY BREAK THE DRIVER ON OTHER PLATFORMS!
  10 The mdio bus on ath79 works in polling mode and doesn't rely on
  11 any interrupt. This patch breaks the driver on any mdio master
  12 with interrupts used.
  13
  14 ---
  15 --- a/drivers/net/phy/ar8216.c
  16 +++ b/drivers/net/phy/ar8216.c
  17 @@ -252,6 +252,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
  18  u32
  19  ar8xxx_read(struct ar8xxx_priv *priv, int reg)
  20  {
  21 +       unsigned long flags;
  22         struct mii_bus *bus = priv->mii_bus;
  23         u16 r1, r2, page;
  24         u32 val;
  25 @@ -259,11 +260,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
  26         split_addr((u32) reg, &r1, &r2, &page);
  27
  28         mutex_lock(&bus->mdio_lock);
  29 +       local_irq_save(flags);
  30
  31         bus->write(bus, 0x18, 0, page);
  32         wait_for_page_switch();
  33         val = ar8xxx_mii_read32(priv, 0x10 | r2, r1);
  34
  35 +       local_irq_restore(flags);
  36         mutex_unlock(&bus->mdio_lock);
  37
  38         return val;
  39 @@ -272,17 +275,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
  40  void
  41  ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val)
  42  {
  43 +       unsigned long flags;
  44         struct mii_bus *bus = priv->mii_bus;
  45         u16 r1, r2, page;
  46
  47         split_addr((u32) reg, &r1, &r2, &page);
  48
  49         mutex_lock(&bus->mdio_lock);
  50 +       local_irq_save(flags);
  51
  52         bus->write(bus, 0x18, 0, page);
  53         wait_for_page_switch();
  54         ar8xxx_mii_write32(priv, 0x10 | r2, r1, val);
  55
  56 +       local_irq_restore(flags);
  57         mutex_unlock(&bus->mdio_lock);
  58  }
  59