net: smc911x: Determine bus width at runtime
cover net: smc911x: Determine bus width at runtime
The SMC911x Ethernet MACs can be integrated using a 16 or 32-bit bus. The driver needs to know about this choice, which is the reason for us having a Kconfig symbol for that.
Now this bus width is already described using a devicetree property, and since the driver is DM compliant and is using the DT now, we should query this at runtime. We leave the Kconfig choice around, in case the DT is missing this property.
Patch 1/2 simplifies the current Kconfig choice, to be a single symbol instead of a two-options choice. This helps with patch 2/2, which queries the DT to learn about the bus width, falling back to the Kconfig symbol if the property cannot be found.
Cheers,
Andre
Andre Przywara (2):
net: smc911x: Drop redundant CONFIG_SMC911X_16_BIT Kconfig symbol
net: smc911x: Determine bus width at runtime
drivers/net/Kconfig | 17 +++++------------ drivers/net/smc911x.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 33 deletions(-)
Signature · 1 line
2.17.5
PATCH 1/2 net: smc911x: Drop redundant CONFIG_SMC911X_16_BIT Kconfig symbol
The SMC911x Ethernet driver needs to know which accessor functions it can use to access the MMIO registers. For that reason we have a Kconfig choice between 16 and 32-bit bus width.
Since it's only those two options that we (and the Linux kernel) support, and there does not seem to be any evidence of another bus width anywhere, limit the Kconfig construct to a simple symbol.
This simplifies the code and allows a later rework to be much easier.
--- drivers/net/Kconfig | 17 +++++------------ drivers/net/smc911x.c | 12 ++---------- 2 files changed, 7 insertions(+), 22 deletions(-)
drivers/net/Kconfig +5 -12
@@ -548,21 +548,14 @@ config SMC911X_BASE of the device (I/O space) endif #DM_ETH -choice - prompt "SMC911X bus width" - default SMC911X_16_BIT - config SMC911X_32_BIT - bool "Enable 32-bit interface" - -config SMC911X_16_BIT - bool "Enable 16-bit interface" + bool "Enable SMC911X 32-bit interface" + default n help - Define this if data bus is 16 bits. If your processor - automatically converts one 32 bit word to two 16 bit - words you may also try CONFIG_SMC911X_32_BIT. + Define this if data bus is 32 bits. If your processor use a + narrower 16 bit bus or cannot convert one 32 bit word to two 16 bit + words, leave this to "n". -endchoice endif #SMC911X config SUN7I_GMAC
drivers/net/smc911x.c +2 -10
@@ -48,12 +48,6 @@ static const struct chip_id chip_ids[] = {#define DRIVERNAME "smc911x" -#if defined (CONFIG_SMC911X_32_BIT ) && \ - defined (CONFIG_SMC911X_16_BIT ) -#error "SMC911X: Only one of CONFIG_SMC911X_32_BIT and \ - CONFIG_SMC911X_16_BIT shall be set" -#endif -#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) {
@@ -64,7 +58,7 @@ static void smc911x_reg_write(struct smc911x_priv *priv, u32 offset, u32 val) {writel (val, priv->iobase + offset); } -#elif defined (CONFIG_SMC911X_16_BIT ) +#else static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { return (readw(priv->iobase + offset) & 0xffff) |
@@ -75,9 +69,7 @@ static void smc911x_reg_write(struct smc911x_priv *priv, u32 offset, u32 val)writew (val &0xffff , priv->iobase + offset); writew(val >> 16, priv->iobase + offset + 2); } -#else -#error "SMC911X: undefined bus width" -#endif /* CONFIG_SMC911X_16_BIT */ +#endif /* CONFIG_SMC911X_32_BIT */ static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) {
Signature · 1 line
2.17.5
Re: [PATCH 1/2] net: smc911x: Drop redundant CONFIG_SMC911X_16_BIT Kconfig symbol
Quoted 86 lines · Andre Przywara
The SMC911x Ethernet driver needs to know which accessor functions it can use to access the MMIO registers. For that reason we have a
Kconfigchoice between 16 and 32-bit bus width.Since it's only those two options that we (and the Linux kernel) support, and there does not seem to be any evidence of another bus width anywhere, limit the
Kconfigconstruct to a simple symbol.This simplifies the code and allows a later rework to be much easier.
Signed-off-by Andre Przywara <[email protected]>--- drivers/net/Kconfig | 17 +++++------------ drivers/net/smc911x.c | 12 ++---------- 2 files changed, 7 insertions(+), 22 deletions(-)drivers/net/Kconfig +5
-12@@ -548,21 +548,14 @@ config SMC911X_BASE of the device (I/O space) endif #DM_ETH -choice - prompt "SMC911X bus width" - default SMC911X_16_BIT - config SMC911X_32_BIT - bool "Enable 32-bit interface" - -config SMC911X_16_BIT - bool "Enable 16-bit interface" + bool "Enable SMC911X 32-bit interface" + default n help - Define this if data bus is 16 bits. If your processor - automatically converts one 32 bit word to two 16 bit - words you may also try CONFIG_SMC911X_32_BIT. + Define this if data bus is 32 bits. If your processor use a + narrower 16 bit bus or cannot convert one 32 bit word to two 16 bit + words, leave this to "n". -endchoice endif #SMC911X config SUN7I_GMACdrivers/net/smc911x.c +2
-11@@ -48,12 +48,6 @@ static const struct chip_id chip_ids[] = {#define DRIVERNAME "smc911x" -#if defined (CONFIG_SMC911X_32_BIT ) && \ - defined (CONFIG_SMC911X_16_BIT ) -#error "SMC911X: Only one of CONFIG_SMC911X_32_BIT and \ - CONFIG_SMC911X_16_BIT shall be set" -#endif -#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) {@@ -64,7 +58,7 @@ static void smc911x_reg_write(struct smc911x_priv *priv, u32 offset, u32 val) {writel (val, priv->iobase + offset); } -#elif defined (CONFIG_SMC911X_16_BIT ) +#else static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { return (readw(priv->iobase + offset) & 0xffff) |@@ -75,9 +69,7 @@ static void smc911x_reg_write(struct smc911x_priv *priv, u32 offset, u32 val)writew (val &0xffff , priv->iobase + offset); writew(val >> 16, priv->iobase + offset + 2); } -#else -#error "SMC911X: undefined bus width" -#endif /* CONFIG_SMC911X_16_BIT */ +#endif /* CONFIG_SMC911X_32_BIT */ static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) { --
Quoted 2 lines
2.17.5
Re: [PATCH 1/2] net: smc911x: Drop redundant CONFIG_SMC911X_16_BIT Kconfig symbol
Quoted 85 lines · Ramon Fried
Quoted 83 lines · Andre Przywara
The SMC911x Ethernet driver needs to know which accessor functions it can use to access the MMIO registers. For that reason we have a
Kconfigchoice between 16 and 32-bit bus width.Since it's only those two options that we (and the Linux kernel) support, and there does not seem to be any evidence of another bus width anywhere, limit the
Kconfigconstruct to a simple symbol.This simplifies the code and allows a later rework to be much easier.
Signed-off-by Andre Przywara <[email protected]>--- drivers/net/Kconfig | 17 +++++------------ drivers/net/smc911x.c | 12 ++---------- 2 files changed, 7 insertions(+), 22 deletions(-)drivers/net/Kconfig +5
-12@@ -548,21 +548,14 @@ config SMC911X_BASE of the device (I/O space) endif #DM_ETH -choice - prompt "SMC911X bus width" - default SMC911X_16_BIT - config SMC911X_32_BIT - bool "Enable 32-bit interface" - -config SMC911X_16_BIT - bool "Enable 16-bit interface" + bool "Enable SMC911X 32-bit interface" + default n help - Define this if data bus is 16 bits. If your processor - automatically converts one 32 bit word to two 16 bit - words you may also try CONFIG_SMC911X_32_BIT. + Define this if data bus is 32 bits. If your processor use a + narrower 16 bit bus or cannot convert one 32 bit word to two 16 bit + words, leave this to "n". -endchoice endif #SMC911X config SUN7I_GMACdrivers/net/smc911x.c +2
-10@@ -48,12 +48,6 @@ static const struct chip_id chip_ids[] = {#define DRIVERNAME "smc911x" -#if defined (CONFIG_SMC911X_32_BIT ) && \ - defined (CONFIG_SMC911X_16_BIT ) -#error "SMC911X: Only one of CONFIG_SMC911X_32_BIT and \ - CONFIG_SMC911X_16_BIT shall be set" -#endif -#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) {@@ -64,7 +58,7 @@ static void smc911x_reg_write(struct smc911x_priv *priv, u32 offset, u32 val) {writel (val, priv->iobase + offset); } -#elif defined (CONFIG_SMC911X_16_BIT ) +#else static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { return (readw(priv->iobase + offset) & 0xffff) |@@ -75,9 +69,7 @@ static void smc911x_reg_write(struct smc911x_priv *priv, u32 offset, u32 val)writew (val &0xffff , priv->iobase + offset); writew(val >> 16, priv->iobase + offset + 2); } -#else -#error "SMC911X: undefined bus width" -#endif /* CONFIG_SMC911X_16_BIT */ +#endif /* CONFIG_SMC911X_32_BIT */
Quoted 6 lines
Quoted 5 lines
drivers/net/smc911x.c +0
-1static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) { --2.17.5
Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot-net/master, Thanks !
Ramon
PATCH 2/2 net: smc911x: Determine bus width at runtime
In reply to Andre PrzywaraThe SMC911x Ethernet MACs can be integrated using a 16 or 32-bit bus. The driver needs to know about this choice, which is the reason for us having a Kconfig symbol for that.
Now this bus width is already described using a devicetree property, and since the driver is DM compliant and is using the DT now, we should query this at runtime. We leave the Kconfig choice around, in case the DT is missing this property.
--- drivers/net/smc911x.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
drivers/net/smc911x.c +20 -13
@@ -28,6 +28,7 @@ struct smc911x_priv {phys_addr_t iobase;const struct chip_id *chipid;unsigned char enetaddr[6 ]; +bool use_32_bit_io; };static const struct chip_id chip_ids[] = {
@@ -48,28 +49,24 @@ static const struct chip_id chip_ids[] = {#define DRIVERNAME "smc911x" -#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { -return readl (priv->iobase + offset); -} +if (priv->use_32_bit_io) +return readl (priv->iobase + offset); -static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) -{ -writel (val, priv->iobase + offset); -} -#else -static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) -{return (readw (priv->iobase + offset) &0xffff ) | (readw (priv->iobase + offset +2 ) <<16 ); } +static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) { -writew (val &0xffff , priv->iobase + offset); -writew (val >>16 , priv->iobase + offset +2 ); +if (priv->use_32_bit_io) { +writel (val, priv->iobase + offset); + }else { +writew (val &0xffff , priv->iobase + offset); +writew (val >>16 , priv->iobase + offset +2 ); + } } -#endif /* CONFIG_SMC911X_32_BIT */ static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) {
@@ -493,6 +490,8 @@ int smc911x_initialize(u8 dev_num, int base_addr) priv->iobase = base_addr; priv->dev.iobase = base_addr; + priv->use_32_bit_io =CONFIG_IS_ENABLED (SMC911X_32_BIT ); +/* Try to detect chip. Will fail if not present. */ ret =smc911x_detect_chip (priv);if (ret) {
@@ -603,10 +602,18 @@ static int smc911x_of_to_plat(struct udevice *dev) {struct smc911x_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_plat (dev); +u32 io_width; +int ret; pdata->iobase =dev_read_addr (dev); priv->iobase = pdata->iobase; + ret =dev_read_u32 (dev,"reg-io-width" , &io_width); +if (!ret) + priv->use_32_bit_io = (io_width ==4 ); +else + priv->use_32_bit_io =CONFIG_IS_ENABLED (SMC911X_32_BIT ); +return 0 ; }
Signature · 1 line
2.17.5
Quoted 94 lines · Andre Przywara
The SMC911x Ethernet MACs can be integrated using a 16 or 32-bit bus. The driver needs to know about this choice, which is the reason for us having a
Kconfigsymbol for that.Now this bus width is already described using a devicetree property, and since the driver is DM compliant and is using the DT now, we should query this at runtime. We leave the
Kconfigchoice around, in case the DT is missing this property.Signed-off-by Andre Przywara <[email protected]>--- drivers/net/smc911x.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)drivers/net/smc911x.c +20
-14@@ -28,6 +28,7 @@ struct smc911x_priv {phys_addr_t iobase;const struct chip_id *chipid;unsigned char enetaddr[6 ]; +bool use_32_bit_io; };static const struct chip_id chip_ids[] = {@@ -48,28 +49,24 @@ static const struct chip_id chip_ids[] = {#define DRIVERNAME "smc911x" -#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { -return readl (priv->iobase + offset); -} +if (priv->use_32_bit_io) +return readl (priv->iobase + offset); -static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) -{ -writel (val, priv->iobase + offset); -} -#else -static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) -{return (readw (priv->iobase + offset) &0xffff ) | (readw (priv->iobase + offset +2 ) <<16 ); } +static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) { -writew (val &0xffff , priv->iobase + offset); -writew (val >>16 , priv->iobase + offset +2 ); +if (priv->use_32_bit_io) { +writel (val, priv->iobase + offset); + }else { +writew (val &0xffff , priv->iobase + offset); +writew (val >>16 , priv->iobase + offset +2 ); + } } -#endif /* CONFIG_SMC911X_32_BIT */ static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) {@@ -493,6 +490,8 @@ int smc911x_initialize(u8 dev_num, int base_addr) priv->iobase = base_addr; priv->dev.iobase = base_addr; + priv->use_32_bit_io =CONFIG_IS_ENABLED (SMC911X_32_BIT ); +/* Try to detect chip. Will fail if not present. */ ret =smc911x_detect_chip (priv);if (ret) {@@ -603,10 +602,18 @@ static int smc911x_of_to_plat(struct udevice *dev) {struct smc911x_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_plat (dev); +u32 io_width; +int ret; pdata->iobase =dev_read_addr (dev); priv->iobase = pdata->iobase; + ret =dev_read_u32 (dev,"reg-io-width" , &io_width); +if (!ret) + priv->use_32_bit_io = (io_width ==4 ); +else + priv->use_32_bit_io =CONFIG_IS_ENABLED (SMC911X_32_BIT ); +return 0 ; } --
Quoted 2 lines
2.17.5
Quoted 95 lines · Ramon Fried
Quoted 93 lines · Andre Przywara
The SMC911x Ethernet MACs can be integrated using a 16 or 32-bit bus. The driver needs to know about this choice, which is the reason for us having a
Kconfigsymbol for that.Now this bus width is already described using a devicetree property, and since the driver is DM compliant and is using the DT now, we should query this at runtime. We leave the
Kconfigchoice around, in case the DT is missing this property.Signed-off-by Andre Przywara <[email protected]>--- drivers/net/smc911x.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)drivers/net/smc911x.c +20
-13@@ -28,6 +28,7 @@ struct smc911x_priv {phys_addr_t iobase;const struct chip_id *chipid;unsigned char enetaddr[6 ]; +bool use_32_bit_io; };static const struct chip_id chip_ids[] = {@@ -48,28 +49,24 @@ static const struct chip_id chip_ids[] = {#define DRIVERNAME "smc911x" -#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { -return readl (priv->iobase + offset); -} +if (priv->use_32_bit_io) +return readl (priv->iobase + offset); -static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) -{ -writel (val, priv->iobase + offset); -} -#else -static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) -{return (readw (priv->iobase + offset) &0xffff ) | (readw (priv->iobase + offset +2 ) <<16 ); } +static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) { -writew (val &0xffff , priv->iobase + offset); -writew (val >>16 , priv->iobase + offset +2 ); +if (priv->use_32_bit_io) { +writel (val, priv->iobase + offset); + }else { +writew (val &0xffff , priv->iobase + offset); +writew (val >>16 , priv->iobase + offset +2 ); + } } -#endif /* CONFIG_SMC911X_32_BIT */ static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) {@@ -493,6 +490,8 @@ int smc911x_initialize(u8 dev_num, int base_addr) priv->iobase = base_addr; priv->dev.iobase = base_addr; + priv->use_32_bit_io =CONFIG_IS_ENABLED (SMC911X_32_BIT ); +/* Try to detect chip. Will fail if not present. */ ret =smc911x_detect_chip (priv);if (ret) {@@ -603,10 +602,18 @@ static int smc911x_of_to_plat(struct udevice *dev) {struct smc911x_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_plat (dev); +u32 io_width; +int ret; pdata->iobase =dev_read_addr (dev); priv->iobase = pdata->iobase; + ret =dev_read_u32 (dev,"reg-io-width" , &io_width); +if (!ret) + priv->use_32_bit_io = (io_width ==4 ); +else + priv->use_32_bit_io =CONFIG_IS_ENABLED (SMC911X_32_BIT ); +return 0 ; }
Quoted 4 lines
Quoted 3 lines
--
2.17.5Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot-net/master, Thanks !
Ramon