Fixes, cleanup and modernization for SONIC ethernet drivers
Subsystems (3)
cover Fixes, cleanup and modernization for SONIC ethernet drivers
Changes since v4 of combined patch series:
- Removed redundant and non-portable MACH_IS_MAC tests.
- Omitted patches unrelated to SONIC drivers.
- Dropped changes to the 'version_printed' logic and debug message text.
Finn Thain (4):
net/macsonic: Convert to nubus_driver net/macsonic: Drop redundant MACH_IS_MAC test net/sonic: Clean up and modernize log messages net/sonic: Replace custom debug logging with netif_* calls
drivers/net/ethernet/natsemi/jazzsonic.c | 32 +--- drivers/net/ethernet/natsemi/macsonic.c | 244 ++++++++++++++++++------------- drivers/net/ethernet/natsemi/sonic.c | 99 +++++++------ drivers/net/ethernet/natsemi/sonic.h | 2 + drivers/net/ethernet/natsemi/xtsonic.c | 30 +--- 5 files changed, 210 insertions(+), 197 deletions(-)
Signature · 1 line
2.16.1
PATCH 1/4 net/macsonic: Convert to nubus_driver
This resolves an old issue preventing any NuBus SONIC NICs from working in a Mac with an on-board SONIC device.
--- drivers/net/ethernet/natsemi/macsonic.c | 173 ++++++++++++++++++++++---------- 1 file changed, 119 insertions(+), 54 deletions(-)
drivers/net/ethernet/natsemi/macsonic.c +119 -54
@@ -60,8 +60,6 @@#include <asm/macints.h> #include <asm/mac_via.h> -static char mac_sonic_string[] ="macsonic" ; -#include "sonic.h" /* These should basically be bus-size and endian independent (since
@@ -410,7 +408,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev)return macsonic_init (dev); } -static int mac_nubus_sonic_ethernet_addr (struct net_device *dev, +static int mac_sonic_nubus_ethernet_addr (struct net_device *dev,unsigned long prom_addr,int id) {int i;
@@ -449,70 +447,49 @@ static int macsonic_ident(struct nubus_rsrc *fres)return -1 ; } -static int mac_nubus_sonic_probe (struct net_device *dev) +static int mac_sonic_nubus_probe_board (struct nubus_board *board,int id, +struct net_device *dev) { -static int slots; -struct nubus_rsrc *ndev =NULL ;struct sonic_local * lp =netdev_priv (dev);unsigned long base_addr, prom_addr;u16 sonic_dcr; -int id =-1 ;int reg_offset, dma_bitmode; -/* Find the first SONIC that hasn't been initialized already */ -for_each_func_rsrc (ndev) { -if (ndev->category !=NUBUS_CAT_NETWORK || - ndev->type !=NUBUS_TYPE_ETHERNET ) -continue ; - -/* Have we seen it already? */ -if (slots & (1 <<ndev->board->slot)) -continue ; - slots |=1 <<ndev->board->slot; - -/* Is it one of ours? */ -if ((id =macsonic_ident (ndev)) !=-1 ) -break ; - } - -if (ndev ==NULL ) -return -ENODEV ; -switch (id) {case MACSONIC_DUODOCK : - base_addr = ndev->board->slot_addr +DUODOCK_SONIC_REGISTERS ; - prom_addr = ndev->board->slot_addr +DUODOCK_SONIC_PROM_BASE ; + base_addr = board->slot_addr +DUODOCK_SONIC_REGISTERS ; + prom_addr = board->slot_addr +DUODOCK_SONIC_PROM_BASE ; sonic_dcr =SONIC_DCR_EXBUS |SONIC_DCR_RFT0 |SONIC_DCR_RFT1 |SONIC_DCR_TFT0 ; reg_offset =2 ; dma_bitmode =SONIC_BITMODE32 ;break ;case MACSONIC_APPLE : - base_addr = ndev->board->slot_addr +APPLE_SONIC_REGISTERS ; - prom_addr = ndev->board->slot_addr +APPLE_SONIC_PROM_BASE ; + base_addr = board->slot_addr +APPLE_SONIC_REGISTERS ; + prom_addr = board->slot_addr +APPLE_SONIC_PROM_BASE ; sonic_dcr =SONIC_DCR_BMS |SONIC_DCR_RFT1 |SONIC_DCR_TFT0 ; reg_offset =0 ; dma_bitmode =SONIC_BITMODE32 ;break ;case MACSONIC_APPLE16 : - base_addr = ndev->board->slot_addr +APPLE_SONIC_REGISTERS ; - prom_addr = ndev->board->slot_addr +APPLE_SONIC_PROM_BASE ; + base_addr = board->slot_addr +APPLE_SONIC_REGISTERS ; + prom_addr = board->slot_addr +APPLE_SONIC_PROM_BASE ; sonic_dcr =SONIC_DCR_EXBUS |SONIC_DCR_RFT1 |SONIC_DCR_TFT0 |SONIC_DCR_PO1 |SONIC_DCR_BMS ; reg_offset =0 ; dma_bitmode =SONIC_BITMODE16 ;break ;case MACSONIC_DAYNALINK : - base_addr = ndev->board->slot_addr +APPLE_SONIC_REGISTERS ; - prom_addr = ndev->board->slot_addr +DAYNALINK_PROM_BASE ; + base_addr = board->slot_addr +APPLE_SONIC_REGISTERS ; + prom_addr = board->slot_addr +DAYNALINK_PROM_BASE ; sonic_dcr =SONIC_DCR_RFT1 |SONIC_DCR_TFT0 |SONIC_DCR_PO1 |SONIC_DCR_BMS ; reg_offset =0 ; dma_bitmode =SONIC_BITMODE16 ;break ;case MACSONIC_DAYNA : - base_addr = ndev->board->slot_addr +DAYNA_SONIC_REGISTERS ; - prom_addr = ndev->board->slot_addr +DAYNA_SONIC_MAC_ADDR ; + base_addr = board->slot_addr +DAYNA_SONIC_REGISTERS ; + prom_addr = board->slot_addr +DAYNA_SONIC_MAC_ADDR ; sonic_dcr =SONIC_DCR_BMS |SONIC_DCR_RFT1 |SONIC_DCR_TFT0 |SONIC_DCR_PO1 ; reg_offset =0 ;
@@ -528,14 +505,14 @@ static int mac_nubus_sonic_probe(struct net_device *dev) dev->base_addr = base_addr; lp->reg_offset = reg_offset; lp->dma_bitmode = dma_bitmode; - dev->irq =SLOT2IRQ (ndev->board->slot); + dev->irq =SLOT2IRQ (board->slot);if (!sonic_version_printed) {printk (KERN_INFO "%s" , version); sonic_version_printed =1 ; }printk (KERN_INFO "%s: %s in slot %X\n" , -dev_name (lp->device), ndev->board->name, ndev->board->slot); +dev_name (lp->device), board->name, board->slot);printk (KERN_INFO "%s: revision 0x%04x, using %d bit DMA and register offset %d\n" ,dev_name (lp->device),SONIC_READ (SONIC_SR ), dma_bitmode?32 :16 , reg_offset);
@@ -557,14 +534,17 @@ static int mac_nubus_sonic_probe(struct net_device *dev)SONIC_WRITE (SONIC_ISR ,0x7fff );/* Now look for the MAC address. */ -if (mac_nubus_sonic_ethernet_addr (dev, prom_addr, id) !=0 ) +if (mac_sonic_nubus_ethernet_addr (dev, prom_addr, id) !=0 )return -ENODEV ; +dev_info (&board->dev,"SONIC ethernet @%08lx, MAC %pM, IRQ %d\n" , + dev->base_addr, dev->dev_addr, dev->irq); +/* Shared init code */ return macsonic_init (dev); } -static int mac_sonic_probe (struct platform_device *pdev) +static int mac_sonic_platform_probe (struct platform_device *pdev) {struct net_device *dev;struct sonic_local *lp;
@@ -579,16 +559,10 @@ static int mac_sonic_probe(struct platform_device *pdev)SET_NETDEV_DEV (dev, &pdev->dev);platform_set_drvdata (pdev, dev); -/* This will catch fatal stuff like -ENOMEM as well as success */ err =mac_onboard_sonic_probe (dev); -if (err ==0 ) - goto found; -if (err != -ENODEV ) - goto out; - err =mac_nubus_sonic_probe (dev);if (err) goto out; -found: + err =register_netdev (dev);if (err) goto out;
@@ -610,7 +584,7 @@ MODULE_ALIAS("platform:macsonic");#include "sonic.c" -static int mac_sonic_device_remove (struct platform_device *pdev) +static int mac_sonic_platform_remove (struct platform_device *pdev) {struct net_device *dev =platform_get_drvdata (pdev);struct sonic_local * lp =netdev_priv (dev);
@@ -623,12 +597,103 @@ static int mac_sonic_device_remove(struct platform_device *pdev)return 0 ; } -static struct platform_driver mac_sonic_driver = { - .probe = mac_sonic_probe, - .remove = mac_sonic_device_remove, - .driver = { - .name = mac_sonic_string, +static struct platform_driver mac_sonic_platform_driver = { + .probe = mac_sonic_platform_probe, + .remove = mac_sonic_platform_remove, + .driver = { + .name ="macsonic" , + }, +}; + +static int mac_sonic_nubus_probe (struct nubus_board *board) +{ +struct net_device *ndev; +struct sonic_local *lp; +struct nubus_rsrc *fres; +int id =-1 ; +int err; + +/* The platform driver will handle a PDS or Comm Slot card (even if +* it has a pseudoslot declaration ROM). +*/ +if (macintosh_config->expansion_type ==MAC_EXP_PDS_COMM ) +return -ENODEV ; + +for_each_board_func_rsrc (board, fres) { +if (fres->category !=NUBUS_CAT_NETWORK || + fres->type !=NUBUS_TYPE_ETHERNET ) +continue ; + + id =macsonic_ident (fres); +if (id !=-1 ) +break ; + } +if (!fres) +return -ENODEV ; + + ndev =alloc_etherdev (sizeof (struct sonic_local )); +if (!ndev) +return -ENOMEM ; + + lp =netdev_priv (ndev); + lp->device = &board->dev; +SET_NETDEV_DEV (ndev, &board->dev); + + err =mac_sonic_nubus_probe_board (board, id, ndev); +if (err) + goto out; + + err =register_netdev (ndev); +if (err) + goto out; + +nubus_set_drvdata (board, ndev); + +return 0 ; + +out: +free_netdev (ndev); +return err; +} + +static int mac_sonic_nubus_remove (struct nubus_board *board) +{ +struct net_device *ndev =nubus_get_drvdata (board); +struct sonic_local *lp =netdev_priv (ndev); + +unregister_netdev (ndev); +dma_free_coherent (lp->device, +SIZEOF_SONIC_DESC *SONIC_BUS_SCALE (lp->dma_bitmode), + lp->descriptors, lp->descriptors_laddr); +free_netdev (ndev); + +return 0 ; +} + +static struct nubus_driver mac_sonic_nubus_driver = { + .probe = mac_sonic_nubus_probe, + .remove = mac_sonic_nubus_remove, + .driver = { + .name ="macsonic-nubus" , + .owner =THIS_MODULE , }, }; -module_platform_driver (mac_sonic_driver); +static int perr, nerr; + +static int __init mac_sonic_init (void ) +{ + perr =platform_driver_register (&mac_sonic_platform_driver); + nerr =nubus_driver_register (&mac_sonic_nubus_driver); +return 0 ; +} +module_init (mac_sonic_init); + +static void __exit mac_sonic_exit(void) +{ +if (!perr) +platform_driver_unregister (&mac_sonic_platform_driver); +if (!nerr) +nubus_driver_unregister (&mac_sonic_nubus_driver); +} +module_exit (mac_sonic_exit);
Signature · 1 line
2.16.1
PATCH 2/4 net/macsonic: Drop redundant MACH_IS_MAC test
In reply to Finn ThainThe MACH_IS_MAC test is redundant here because the platform device won't get registered unless MACH_IS_MAC.
--- drivers/net/ethernet/natsemi/macsonic.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/natsemi/macsonic.c +0 -3
@@ -311,9 +311,6 @@ static int mac_onboard_sonic_probe(struct net_device *dev)int sr;bool commslot = macintosh_config->expansion_type ==MAC_EXP_PDS_COMM ; -if (!MACH_IS_MAC ) -return -ENODEV ; -printk (KERN_INFO "Checking for internal Macintosh ethernet (SONIC).. " );/* Bogus probing, on the models which may or may not have
Signature · 1 line
2.16.1
PATCH 3/4 net/sonic: Clean up and modernize log messages
In reply to Finn ThainAdd missing printk severity levels by adopting pr_foo() calls for the platform_driver and dev_foo() calls for the nubus_driver. Avoid KERN_CONT usage as per advice from checkpatch.
Avoid #ifdef around printk calls.
Don't log driver probe messages after calling register_netdev().
---
Only the macsonic.c changes have been tested. The other changes are similar but untested.
--- drivers/net/ethernet/natsemi/jazzsonic.c | 13 ++++----- drivers/net/ethernet/natsemi/macsonic.c | 49 ++++++++++++++------------------ drivers/net/ethernet/natsemi/xtsonic.c | 11 +++---- 3 files changed, 33 insertions(+), 40 deletions(-)
drivers/net/ethernet/natsemi/jazzsonic.c +6 -7
@@ -142,17 +142,14 @@ static int sonic_probe1(struct net_device *dev) i++;if (known_revisions[i] ==0xffff ) { -printk ("SONIC ethernet controller not found (0x%4x)\n" , - silicon_revision); +pr_info ("SONIC ethernet controller not found (0x%4x)\n" , + silicon_revision); goto out; }if (sonic_debug && version_printed++ ==0 )printk (version); -printk (KERN_INFO "%s: Sonic ethernet found at 0x%08lx, " , -dev_name (lp->device), dev->base_addr); -/* * Put the sonic into software reset, then * retrieve and print the ethernet address.
@@ -245,12 +242,14 @@ static int jazz_sonic_probe(struct platform_device *pdev) err =sonic_probe1 (dev);if (err) goto out; + +pr_info ("SONIC ethernet @%08lx, MAC %pM, IRQ %d\n" , + dev->base_addr, dev->dev_addr, dev->irq); + err =register_netdev (dev);if (err) goto out1; -printk ("%s: MAC %pM IRQ %d\n" , dev->name, dev->dev_addr, dev->irq); -return 0 ; out1:
drivers/net/ethernet/natsemi/macsonic.c +21 -28
107 lines not on this page · raw message
drivers/net/ethernet/natsemi/xtsonic.c +6 -5
@@ -155,8 +155,8 @@ static int __init sonic_probe1(struct net_device *dev) i++;if (known_revisions[i] ==0xffff ) { -printk ("SONIC ethernet controller not found (0x%4x)\n" , - silicon_revision); +pr_info ("SONIC ethernet controller not found (0x%4x)\n" , + silicon_revision);return -ENODEV ; }
@@ -273,12 +273,13 @@ int xtsonic_probe(struct platform_device *pdev)if ((err =sonic_probe1 (dev))) goto out; + +pr_info ("SONIC ethernet @%08lx, MAC %pM, IRQ %d\n" , + dev->base_addr, dev->dev_addr, dev->irq); +if ((err =register_netdev (dev))) goto out1; -printk ("%s: SONIC ethernet @%08lx, MAC %pM, IRQ %d\n" , dev->name, - dev->base_addr, dev->dev_addr, dev->irq); -return 0 ; out1:
Signature · 1 line
2.16.1
PATCH 4/4 net/sonic: Replace custom debug logging with netif_* calls
In reply to Finn ThainEliminate duplicated debug code by moving it into the core driver. Don't log the only valid silicon revision number (it's in the source).
---
Only the sonic.[ch] and macsonic.c changes have been tested. The other changes are similar but untested.
--- drivers/net/ethernet/natsemi/jazzsonic.c | 19 +----- drivers/net/ethernet/natsemi/macsonic.c | 25 ++------ drivers/net/ethernet/natsemi/sonic.c | 99 ++++++++++++++++---------------- drivers/net/ethernet/natsemi/sonic.h | 2 + drivers/net/ethernet/natsemi/xtsonic.c | 19 +----- 5 files changed, 61 insertions(+), 103 deletions(-)
drivers/net/ethernet/natsemi/jazzsonic.c +2 -17
@@ -60,14 +60,6 @@ do { \ *((volatile unsigned int *)dev->base_addr+(reg)) = (val); \ }while (0 ) - -/* use 0 for production, 1 for verification, >1 for debug */ -#ifdef SONIC_DEBUG -static unsigned int sonic_debug =SONIC_DEBUG ; -#else -static unsigned int sonic_debug =1 ; -#endif -/* * We cannot use station (ethernet) address prefixes to detect the * sonic controller since these are board manufacturer depended.
@@ -117,7 +109,6 @@ static const struct net_device_ops sonic_netdev_ops = {static int sonic_probe1 (struct net_device *dev) { -static unsigned version_printed;unsigned int silicon_revision;unsigned int val;struct sonic_local *lp =netdev_priv (dev);
@@ -133,9 +124,6 @@ static int sonic_probe1(struct net_device *dev)* the expected location. */ silicon_revision =SONIC_READ (SONIC_SR ); -if (sonic_debug >1 ) -printk ("SONIC Silicon Revision = 0x%04x\n" ,silicon_revision); - i =0 ;while (known_revisions[i] !=0xffff && known_revisions[i] != silicon_revision)
@@ -147,9 +135,6 @@ static int sonic_probe1(struct net_device *dev) goto out; } -if (sonic_debug && version_printed++ ==0 ) -printk (version); -/* * Put the sonic into software reset, then * retrieve and print the ethernet address.
@@ -246,6 +231,8 @@ static int jazz_sonic_probe(struct platform_device *pdev)pr_info ("SONIC ethernet @%08lx, MAC %pM, IRQ %d\n" , dev->base_addr, dev->dev_addr, dev->irq); +sonic_msg_init (dev); + err =register_netdev (dev);if (err) goto out1;
@@ -261,8 +248,6 @@ static int jazz_sonic_probe(struct platform_device *pdev) }MODULE_DESCRIPTION ("Jazz SONIC ethernet driver" ); -module_param (sonic_debug, int,0 ); -MODULE_PARM_DESC (sonic_debug,"jazzsonic debug level (1-4)" );MODULE_ALIAS ("platform:jazzsonic" );#include "sonic.c"
drivers/net/ethernet/natsemi/macsonic.c +4 -21
@@ -70,15 +70,6 @@#define SONIC_WRITE (reg,val) (nubus_writew(val, dev->base_addr + (reg * 4) \ + lp->reg_offset)) -/* use 0 for production, 1 for verification, >1 for debug */ -#ifdef SONIC_DEBUG -static unsigned int sonic_debug =SONIC_DEBUG ; -#else -static unsigned int sonic_debug =1 ; -#endif - -static int sonic_version_printed; -/* For onboard SONIC */ #define ONBOARD_SONIC_REGISTERS 0x50F0A000#define ONBOARD_SONIC_PROM_BASE 0x50f08000
@@ -333,11 +324,6 @@ static int mac_onboard_sonic_probe(struct net_device *dev)else dev->irq =IRQ_NUBUS_9 ; -if (!sonic_version_printed) { -printk (KERN_INFO "%s" , version); - sonic_version_printed =1 ; - } -/* The PowerBook's SONIC is 16 bit always. */ if (macintosh_config->ident ==MAC_MODEL_PB520 ) { lp->reg_offset =0 ;
@@ -499,11 +485,6 @@ static int mac_sonic_nubus_probe_board(struct nubus_board *board, int id, lp->dma_bitmode = dma_bitmode; dev->irq =SLOT2IRQ (board->slot); -if (!sonic_version_printed) { -printk (KERN_INFO "%s" , version); - sonic_version_printed =1 ; - } -dev_info (&board->dev,"%s, revision 0x%04x, %d bit DMA, register offset %d\n" , board->name,SONIC_READ (SONIC_SR ), lp->dma_bitmode ?32 :16 , lp->reg_offset);
@@ -555,6 +536,8 @@ static int mac_sonic_platform_probe(struct platform_device *pdev)if (err) goto out; +sonic_msg_init (dev); + err =register_netdev (dev);if (err) goto out;
@@ -568,8 +551,6 @@ static int mac_sonic_platform_probe(struct platform_device *pdev) }MODULE_DESCRIPTION ("Macintosh SONIC ethernet driver" ); -module_param (sonic_debug, int,0 ); -MODULE_PARM_DESC (sonic_debug,"macsonic debug level (1-4)" );MODULE_ALIAS ("platform:macsonic" );#include "sonic.c"
@@ -633,6 +614,8 @@ static int mac_sonic_nubus_probe(struct nubus_board *board)if (err) goto out; +sonic_msg_init (ndev); + err =register_netdev (ndev);if (err) goto out;
drivers/net/ethernet/natsemi/sonic.c +51 -48
232 lines not on this page · raw message
drivers/net/ethernet/natsemi/sonic.h +2 -0
@@ -319,6 +319,7 @@ struct sonic_local {unsigned int eol_rx;unsigned int eol_tx;/* last unacked transmit packet */ unsigned int next_tx;/* next free TD */ +int msg_enable;struct device *device;/* generic device */ struct net_device_stats stats; };
@@ -336,6 +337,7 @@ static struct net_device_stats *sonic_get_stats(struct net_device *dev);static void sonic_multicast_list (struct net_device *dev);static int sonic_init (struct net_device *dev);static void sonic_tx_timeout (struct net_device *dev); +static void sonic_msg_init (struct net_device *dev);/* Internal inlines for reading/writing DMA buffers. Note that bus size and endianness matter here, whereas they don't for registers,
drivers/net/ethernet/natsemi/xtsonic.c +2 -17
@@ -73,14 +73,6 @@ extern void xtboard_get_ether_addr(unsigned char *buf);#define SONIC_WRITE (reg,val) \ *((volatile unsigned int *)dev->base_addr+reg) = val - -/* Use 0 for production, 1 for verification, and >2 for debug */ -#ifdef SONIC_DEBUG -static unsigned int sonic_debug =SONIC_DEBUG ; -#else -static unsigned int sonic_debug =1 ; -#endif -/* * We cannot use station (ethernet) address prefixes to detect the * sonic controller since these are board manufacturer depended.
@@ -130,7 +122,6 @@ static const struct net_device_ops xtsonic_netdev_ops = {static int __init sonic_probe1 (struct net_device *dev) { -static unsigned version_printed =0 ;unsigned int silicon_revision;struct sonic_local *lp =netdev_priv (dev);unsigned int base_addr = dev->base_addr;
@@ -146,9 +137,6 @@ static int __init sonic_probe1(struct net_device *dev)* the expected location. */ silicon_revision =SONIC_READ (SONIC_SR ); -if (sonic_debug >1 ) -printk ("SONIC Silicon Revision = 0x%04x\n" ,silicon_revision); - i =0 ;while ((known_revisions[i] !=0xffff ) && (known_revisions[i] != silicon_revision))
@@ -160,9 +148,6 @@ static int __init sonic_probe1(struct net_device *dev)return -ENODEV ; } -if (sonic_debug && version_printed++ ==0 ) -printk (version); -/* * Put the sonic into software reset, then retrieve ethernet address. * Note: we are assuming that the boot-loader has initialized the cam.
@@ -277,6 +262,8 @@ int xtsonic_probe(struct platform_device *pdev)pr_info ("SONIC ethernet @%08lx, MAC %pM, IRQ %d\n" , dev->base_addr, dev->dev_addr, dev->irq); +sonic_msg_init (dev); +if ((err =register_netdev (dev))) goto out1;
@@ -291,8 +278,6 @@ int xtsonic_probe(struct platform_device *pdev) }MODULE_DESCRIPTION ("Xtensa XT2000 SONIC ethernet driver" ); -module_param (sonic_debug, int,0 ); -MODULE_PARM_DESC (sonic_debug,"xtsonic debug level (1-4)" );#include "sonic.c"
Signature · 1 line
2.16.1
Re: [PATCH net 2/4] net/macsonic: Drop redundant MACH_IS_MAC test
In reply to Finn ThainQuoted 5 lines · Finn Thain
The
MACH_IS_MACtest is redundant here because the platform device won't get registered unlessMACH_IS_MAC.Cc Geert Uytterhoeven <[email protected]>Signed-off-by Finn Thain <[email protected]>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
David Miller
maintainerFrom: Finn Thain <[email protected]>
Date: Sat, 24 Feb 2018 18:27:24 -0500 (EST)
Quoted 4 lines
Changes since v4 of combined patch series:
- Removed redundant and non-portableMACH_IS_MACtests.
- Omitted patches unrelated to SONIC drivers.
- Dropped changes to the 'version_printed' logic and debug message text.
Series applied, thank you.