net: dsa: microchip: Use regs[] to access REG_PTP_RTC_NANOSEC

Accesses to the PTP_RTC_NANOSEC register are done through a hardcoded
address which doesn't match with the KSZ8463's register layout.

Add a new entry for the PTP_RTC_NANOSEC register in the regs[] tables.
Use the regs[] table to retrieve the PTP_RTC_NANOSEC register address
when accessing it.
Remove the macro defining the address to prevent further use.

Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
Link: https://patch.msgid.link/20260105-ksz-rework-v1-4-a68df7f57375@bootlin.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index d7f407370c1cc59402d444e27ebe44e7a600b441..d400a4ad57b5691d54bce7680fc831475535a85c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -570,6 +570,7 @@ static const u16 ksz8463_regs[] = {
        [S_BROADCAST_CTRL]              = 0x06,
        [S_MULTICAST_CTRL]              = 0x04,
        [PTP_CLK_CTRL]                  = 0x0600,
+       [PTP_RTC_NANOSEC]               = 0x0604,
 };
 
 static const u32 ksz8463_masks[] = {
@@ -805,6 +806,7 @@ static const u16 ksz9477_regs[] = {
        [REG_PORT_PME_STATUS]           = 0x0013,
        [REG_PORT_PME_CTRL]             = 0x0017,
        [PTP_CLK_CTRL]                  = 0x0500,
+       [PTP_RTC_NANOSEC]               = 0x0504,
 };
 
 static const u32 ksz9477_masks[] = {

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 8033cb9d84838705389e6ed52a5a54aaa8b49497..6d100f1f5e6efe8b43969845ca517625ea825314 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -272,6 +272,7 @@ enum ksz_regs {
        REG_PORT_PME_STATUS,
        REG_PORT_PME_CTRL,
        PTP_CLK_CTRL,
+       PTP_RTC_NANOSEC,
 };
 
 enum ksz_masks {

diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c
index 68553d9f1e0e3a3cd6319d73b7f9bf6ee2fce7ce..226b10d0f89a6d58c9b329a66ee25eabc9d294a9 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_ptp.c
+++ b/drivers/net/dsa/microchip/ksz_ptp.c
@@ -600,7 +600,7 @@ static int _ksz_ptp_gettime(struct ksz_device *dev, struct timespec64 *ts)
        if (ret)
                return ret;
 
-       ret = ksz_read32(dev, REG_PTP_RTC_NANOSEC, &nanoseconds);
+       ret = ksz_read32(dev, regs[PTP_RTC_NANOSEC], &nanoseconds);
        if (ret)
                return ret;
 
@@ -687,7 +687,7 @@ static int ksz_ptp_settime(struct ptp_clock_info *ptp,
        if (ret)
                goto unlock;
 
-       ret = ksz_write32(dev, REG_PTP_RTC_NANOSEC, ts->tv_nsec);
+       ret = ksz_write32(dev, regs[PTP_RTC_NANOSEC], ts->tv_nsec);
        if (ret)
                goto unlock;
 
@@ -778,7 +778,7 @@ static int ksz_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
         */
        sec = div_s64_rem(delta, NSEC_PER_SEC, &nsec);
 
-       ret = ksz_write32(dev, REG_PTP_RTC_NANOSEC, abs(nsec));
+       ret = ksz_write32(dev, regs[PTP_RTC_NANOSEC], abs(nsec));
        if (ret)
                goto unlock;
 

diff --git a/drivers/net/dsa/microchip/ksz_ptp_reg.h b/drivers/net/dsa/microchip/ksz_ptp_reg.h
index bf8526390c2a2face12406c575a1ea3e4d42e3e6..9ab918c7af4b46a73e00846950ac09917c65db5a 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_ptp_reg.h
+++ b/drivers/net/dsa/microchip/ksz_ptp_reg.h
@@ -29,8 +29,6 @@
 #define PTP_RTC_SUB_NANOSEC_M          0x0007
 #define PTP_RTC_0NS                    0x00
 
-#define REG_PTP_RTC_NANOSEC            0x0504
-
 #define REG_PTP_RTC_SEC                        0x0508
 
 #define REG_PTP_SUBNANOSEC_RATE                0x050C