From: Ben Hutchings <bhutchings@solarflare.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
linux-net-drivers <linux-net-drivers@solarflare.com>
Subject: Pull request: sfc-next 2013-08-22
Date: Thu, 22 Aug 2013 13:43:12 +0100 [thread overview]
Message-ID: <1377175392.1703.5.camel@bwh-desktop.uk.level5networks.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 5079 bytes --]
The following changes since commit 563b44951e76bd23ba3fabcc3a0c708d8f59c5fb:
Merge branch 'openvswitch_vxlan' (2013-08-20 00:16:47 -0700)
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 f76fe120d81c96fa2a17ae41f0647c963dbb43cd:
sfc: Update and improve kernel-doc for efx_mcdi_state & efx_mcdi_iface (2013-08-21 20:20:41 +0100)
1. Merge of the fix that I just asked you to pull for net. This does
*not* merge in anything else that isn't already in net-next.
2. Refactoring and cleanup in preparation for new hardware support.
3. Update MCDI (firmware interface) definitions.
Ben.
----------------------------------------------------------------
Ben Hutchings (33):
sfc: Fix lookup of default RX MAC filters when steered using ethtool
Merge branch 'sfc-3.11'
sfc: const-qualify source pointers for MMIO write functions
sfc: Use efx_mcdi_mon() to find efx_mcdi_mon structure from efx_nic
sfc: Move details of a Falcon bug workaround out of ethtool.c
sfc: Move more Falcon-specific code and definitions into falcon.c
sfc: Introduce and use MCDI_DECLARE_BUF macro
sfc: Rationalise MCDI buffer accessors
sfc: Fill out the set of MCDI accessors
sfc: Introduce and use MCDI_CTL_SDU_LEN_MAX_V1 macro for Siena-specific code
sfc: Use proper macros to declare and access MCDI arrays
sfc: Ensure MCDI buffers, but not lengths, are dword aligned
sfc: Add and use MCDI_SET_QWORD() and MCDI_SET_ARRAY_QWORD()
sfc: Move siena_reset_hw() and siena_map_reset_reason() into MCDI module
sfc: Move efx_mcdi_mac_reconfigure() to siena.c and rename
sfc: Collect all MCDI port functions into mcdi_port.c
sfc: Make efx_mcdi_init() call efx_mcdi_handle_assertion()
sfc: Make MCDI independent of Siena
sfc: Add GFP flags to efx_nic_alloc_buffer() and make most callers allow blocking
sfc: Make struct efx_special_buffer less special
sfc: Rename Falcon-architecture register definitions
sfc: Remove efx_process_channel_now()
sfc: Rework IRQ enable/disable
sfc: Limit scope of a Falcon A1 IRQ workaround
sfc: Stop RX refill before flushing RX queues
sfc: Remove bogus call to efx_release_tx_buffers()
sfc: Refactor queue teardown sequence to allow for EF10 flush behaviour
sfc: Move and rename Falcon/Siena common NIC operations
sfc: Translate MCDI error numbers received in events
sfc: Update MCDI protocol definitions for EF10
sfc: Add support for MCDI v2
sfc: Fix race in completion handling
sfc: Update and improve kernel-doc for efx_mcdi_state & efx_mcdi_iface
drivers/net/ethernet/sfc/Makefile | 6 +-
drivers/net/ethernet/sfc/efx.c | 216 +-
drivers/net/ethernet/sfc/efx.h | 3 -
drivers/net/ethernet/sfc/ethtool.c | 23 +-
drivers/net/ethernet/sfc/falcon.c | 639 ++-
drivers/net/ethernet/sfc/falcon_xmac.c | 362 --
drivers/net/ethernet/sfc/farch.c | 1781 +++++++
drivers/net/ethernet/sfc/{regs.h => farch_regs.h} | 266 +-
drivers/net/ethernet/sfc/filter.c | 4 +-
drivers/net/ethernet/sfc/io.h | 18 +-
drivers/net/ethernet/sfc/mcdi.c | 477 +-
drivers/net/ethernet/sfc/mcdi.h | 184 +-
drivers/net/ethernet/sfc/mcdi_mac.c | 130 -
drivers/net/ethernet/sfc/mcdi_mon.c | 15 +-
drivers/net/ethernet/sfc/mcdi_pcol.h | 5536 ++++++++++++++++++--
.../net/ethernet/sfc/{mcdi_phy.c => mcdi_port.c} | 325 +-
drivers/net/ethernet/sfc/net_driver.h | 157 +-
drivers/net/ethernet/sfc/nic.c | 1812 +------
drivers/net/ethernet/sfc/nic.h | 263 +-
drivers/net/ethernet/sfc/phy.h | 17 -
drivers/net/ethernet/sfc/ptp.c | 81 +-
drivers/net/ethernet/sfc/rx.c | 9 +-
drivers/net/ethernet/sfc/selftest.c | 11 -
drivers/net/ethernet/sfc/siena.c | 284 +-
drivers/net/ethernet/sfc/siena_sriov.c | 98 +-
drivers/net/ethernet/sfc/tx.c | 24 +-
drivers/net/ethernet/sfc/workarounds.h | 2 -
27 files changed, 8901 insertions(+), 3842 deletions(-)
delete mode 100644 drivers/net/ethernet/sfc/falcon_xmac.c
create mode 100644 drivers/net/ethernet/sfc/farch.c
rename drivers/net/ethernet/sfc/{regs.h => farch_regs.h} (92%)
delete mode 100644 drivers/net/ethernet/sfc/mcdi_mac.c
rename drivers/net/ethernet/sfc/{mcdi_phy.c => mcdi_port.c} (74%)
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2013-08-22 12:43 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 12:43 Ben Hutchings [this message]
2013-08-22 12:44 ` [PATCH net-next 01/32] sfc: Fix lookup of default RX MAC filters when steered using ethtool Ben Hutchings
2013-08-22 12:44 ` [PATCH net-next 02/32] sfc: const-qualify source pointers for MMIO write functions Ben Hutchings
2013-08-22 12:45 ` [PATCH net-next 03/32] sfc: Use efx_mcdi_mon() to find efx_mcdi_mon structure from efx_nic Ben Hutchings
2013-08-22 12:45 ` [PATCH net-next 04/32] sfc: Move details of a Falcon bug workaround out of ethtool.c Ben Hutchings
2013-08-22 12:46 ` [PATCH net-next 05/32] sfc: Move more Falcon-specific code and definitions into falcon.c Ben Hutchings
2013-08-22 12:46 ` [PATCH net-next 06/32] sfc: Introduce and use MCDI_DECLARE_BUF macro Ben Hutchings
2013-08-22 12:47 ` [PATCH net-next 07/32] sfc: Rationalise MCDI buffer accessors Ben Hutchings
2013-08-22 12:48 ` [PATCH net-next 08/32] sfc: Fill out the set of MCDI accessors Ben Hutchings
2013-08-22 12:48 ` [PATCH net-next 09/32] sfc: Introduce and use MCDI_CTL_SDU_LEN_MAX_V1 macro for Siena-specific code Ben Hutchings
2013-08-22 12:49 ` [PATCH net-next 10/32] sfc: Use proper macros to declare and access MCDI arrays Ben Hutchings
2013-08-22 12:49 ` [PATCH net-next 11/32] sfc: Ensure MCDI buffers, but not lengths, are dword aligned Ben Hutchings
2013-08-22 12:50 ` [PATCH net-next 12/32] sfc: Add and use MCDI_SET_QWORD() and MCDI_SET_ARRAY_QWORD() Ben Hutchings
2013-08-22 12:50 ` [PATCH net-next 13/32] sfc: Move siena_reset_hw() and siena_map_reset_reason() into MCDI module Ben Hutchings
2013-08-22 12:50 ` [PATCH net-next 14/32] sfc: Move efx_mcdi_mac_reconfigure() to siena.c and rename Ben Hutchings
2013-08-22 12:52 ` [PATCH net-next 15/32] sfc: Collect all MCDI port functions into mcdi_port.c Ben Hutchings
2013-08-22 12:53 ` [PATCH net-next 16/32] sfc: Make efx_mcdi_init() call efx_mcdi_handle_assertion() Ben Hutchings
2013-08-22 12:54 ` [PATCH net-next 17/32] sfc: Make MCDI independent of Siena Ben Hutchings
2013-08-22 12:54 ` [PATCH net-next 18/32] sfc: Add GFP flags to efx_nic_alloc_buffer() and make most callers allow blocking Ben Hutchings
2013-08-22 12:55 ` [PATCH net-next 19/32] sfc: Make struct efx_special_buffer less special Ben Hutchings
2013-08-22 12:55 ` [PATCH net-next 20/32] sfc: Rename Falcon-architecture register definitions Ben Hutchings
2013-08-22 12:56 ` [PATCH net-next 21/32] sfc: Remove efx_process_channel_now() Ben Hutchings
2013-08-22 12:57 ` [PATCH net-next 22/32] sfc: Rework IRQ enable/disable Ben Hutchings
2013-08-22 12:59 ` [PATCH net-next 23/32] sfc: Limit scope of a Falcon A1 IRQ workaround Ben Hutchings
2013-08-22 13:00 ` [PATCH net-next 24/32] sfc: Stop RX refill before flushing RX queues Ben Hutchings
2013-08-22 13:00 ` [PATCH net-next 25/32] sfc: Remove bogus call to efx_release_tx_buffers() Ben Hutchings
2013-08-22 13:02 ` [PATCH net-next 26/32] sfc: Refactor queue teardown sequence to allow for EF10 flush behaviour Ben Hutchings
2013-08-22 13:05 ` [PATCH net-next 27/32] sfc: Move and rename Falcon/Siena common NIC operations Ben Hutchings
2013-08-22 13:05 ` [PATCH net-next 28/32] sfc: Translate MCDI error numbers received in events Ben Hutchings
2013-08-22 13:07 ` [PATCH net-next 29/32] sfc: Update MCDI protocol definitions for EF10 Ben Hutchings
2013-08-22 13:09 ` [PATCH net-next 30/32] sfc: Add support for MCDI v2 Ben Hutchings
2013-08-22 13:10 ` [PATCH net-next 31/32] sfc: Fix race in completion handling Ben Hutchings
2013-08-22 13:10 ` [PATCH net-next 32/32] sfc: Update and improve kernel-doc for efx_mcdi_state & efx_mcdi_iface Ben Hutchings
2013-08-22 19:09 ` Pull request: sfc-next 2013-08-22 David Miller
2013-08-22 19:16 ` Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377175392.1703.5.camel@bwh-desktop.uk.level5networks.com \
--to=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=linux-net-drivers@solarflare.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox