| Message ID | 1377833794.2552.26.camel@deadeye.wl.decadent.org.uk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Ben Hutchings <bhutchings@solarflare.com> Date: Fri, 30 Aug 2013 04:36:34 +0100 > 1. A little more refactoring. > 2. Remove the unnecessary use of atomic_t that you pointed out. > 3. Add support for starting or queueing firmware requests from atomic > context. > 4. Add hwmon support for additional sensors found on some new boards. > 5. Add support for the EF10 controller architecture, the SFC9100 family > and specifically the SFC9120 controller. Pulled, thanks Ben. Maybe you can get away with just doing "atomic_inc_return()" for the MCDI sequence number bump and avoid the iface lock in those paths? Just an idea. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 2013-08-31 at 22:28 -0400, David Miller wrote: > From: Ben Hutchings <bhutchings@solarflare.com> > Date: Fri, 30 Aug 2013 04:36:34 +0100 > > > 1. A little more refactoring. > > 2. Remove the unnecessary use of atomic_t that you pointed out. > > 3. Add support for starting or queueing firmware requests from atomic > > context. > > 4. Add hwmon support for additional sensors found on some new boards. > > 5. Add support for the EF10 controller architecture, the SFC9100 family > > and specifically the SFC9120 controller. > > Pulled, thanks Ben. > > Maybe you can get away with just doing "atomic_inc_return()" for the > MCDI sequence number bump and avoid the iface lock in those paths? I haven't checked, but I think the spinlock will almost always be uncontended. It can bounce between CPUs, but then so will seqno. So I don't think that would make any significant difference to performance. Ben.
On Sat, 2013-08-31 at 22:28 -0400, David Miller wrote: > From: Ben Hutchings <bhutchings@solarflare.com> > Date: Fri, 30 Aug 2013 04:36:34 +0100 > > > 1. A little more refactoring. > > 2. Remove the unnecessary use of atomic_t that you pointed out. > > 3. Add support for starting or queueing firmware requests from atomic > > context. > > 4. Add hwmon support for additional sensors found on some new boards. > > 5. Add support for the EF10 controller architecture, the SFC9100 family > > and specifically the SFC9120 controller. > > Pulled, thanks Ben. And thanks for reviewing all these changes so quickly. Ben. > Maybe you can get away with just doing "atomic_inc_return()" for the > MCDI sequence number bump and avoid the iface lock in those paths? > > Just an idea.
The following changes since commit d4fbdcfe93928fbcb7374ea490e41f7b69d95380: sfc: Use extended MC_CMD_SENSOR_INFO and MC_CMD_READ_SENSORS (2013-08-27 22:29:56 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next.git for-davem for you to fetch changes up to f7a6d2c4427790cc8695401576dc594fcce8fc80: sfc: Update copyright banners (2013-08-29 23:34:51 +0100) 1. A little more refactoring. 2. Remove the unnecessary use of atomic_t that you pointed out. 3. Add support for starting or queueing firmware requests from atomic context. 4. Add hwmon support for additional sensors found on some new boards. 5. Add support for the EF10 controller architecture, the SFC9100 family and specifically the SFC9120 controller. Ben. ---------------------------------------------------------------- Alexandre Rames (1): sfc: Use a global count of active queues instead of pending drains Ben Hutchings (12): sfc: Add support for new board sensors sfc: Refactor efx_mcdi_rpc_start() and efx_mcdi_copyin() sfc: Remove unnecessary use of atomic_t sfc: Implement asynchronous MCDI requests sfc: Document conditions for multicast replication vs filter replacement sfc: Allow efx_nic_type::dimension_resources to fail sfc: Initialise IRQ moderation for all NIC types from efx_init_eventq() sfc: Extend struct efx_tx_buffer to allow pushing option descriptors sfc: Add EF10 register and structure definitions sfc: Make efx_mcdi_{init,fini}() call efx_mcdi_drv_attach() sfc: Add support for Solarflare SFC9100 family sfc: Update copyright banners Jon Cooper (2): sfc: Allow event queue initialisation to fail sfc: Prepare for RX scatter on EF10 Matthew Slattery (1): sfc: Allocate NVRAM partition ID range for PHY images drivers/net/ethernet/sfc/Kconfig | 9 +- drivers/net/ethernet/sfc/Makefile | 4 +- drivers/net/ethernet/sfc/bitfield.h | 8 +- drivers/net/ethernet/sfc/ef10.c | 3043 ++++++++++++++++++++++++++++++ drivers/net/ethernet/sfc/ef10_regs.h | 415 ++++ drivers/net/ethernet/sfc/efx.c | 175 +- drivers/net/ethernet/sfc/efx.h | 26 +- drivers/net/ethernet/sfc/enum.h | 4 +- drivers/net/ethernet/sfc/ethtool.c | 6 +- drivers/net/ethernet/sfc/falcon.c | 7 +- drivers/net/ethernet/sfc/falcon_boards.c | 4 +- drivers/net/ethernet/sfc/farch.c | 28 +- drivers/net/ethernet/sfc/farch_regs.h | 4 +- drivers/net/ethernet/sfc/filter.h | 4 +- drivers/net/ethernet/sfc/io.h | 24 +- drivers/net/ethernet/sfc/mcdi.c | 461 ++++- drivers/net/ethernet/sfc/mcdi.h | 45 +- drivers/net/ethernet/sfc/mcdi_mon.c | 125 +- drivers/net/ethernet/sfc/mcdi_pcol.h | 4 + drivers/net/ethernet/sfc/mcdi_port.c | 25 +- drivers/net/ethernet/sfc/mdio_10g.c | 2 +- drivers/net/ethernet/sfc/mdio_10g.h | 2 +- drivers/net/ethernet/sfc/mtd.c | 4 +- drivers/net/ethernet/sfc/net_driver.h | 33 +- drivers/net/ethernet/sfc/nic.c | 4 +- drivers/net/ethernet/sfc/nic.h | 89 +- drivers/net/ethernet/sfc/phy.h | 2 +- drivers/net/ethernet/sfc/ptp.c | 4 +- drivers/net/ethernet/sfc/qt202x_phy.c | 4 +- drivers/net/ethernet/sfc/rx.c | 46 +- drivers/net/ethernet/sfc/selftest.c | 4 +- drivers/net/ethernet/sfc/selftest.h | 4 +- drivers/net/ethernet/sfc/siena.c | 28 +- drivers/net/ethernet/sfc/siena_sriov.c | 4 +- drivers/net/ethernet/sfc/tenxpress.c | 2 +- drivers/net/ethernet/sfc/tx.c | 8 +- drivers/net/ethernet/sfc/txc43128_phy.c | 2 +- drivers/net/ethernet/sfc/vfdi.h | 2 +- drivers/net/ethernet/sfc/workarounds.h | 10 +- 39 files changed, 4404 insertions(+), 271 deletions(-) create mode 100644 drivers/net/ethernet/sfc/ef10.c create mode 100644 drivers/net/ethernet/sfc/ef10_regs.h