-
Notifications
You must be signed in to change notification settings - Fork 22
hundeboll/fpga ofs dev n5010 #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
hundeboll-silicom
wants to merge
10
commits into
fpga-ofs-dev-n5010
from
hundeboll/fpga-ofs-dev-n5010
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fcc6aff
pci: add Silicom Denmark vendor id
hundeboll-silicom f17ccaa
fpga: dfl: pci: add device id for Silicom N5010 PAC card
hundeboll-silicom 64650b0
fpga: dfl-spi-altera: support n1050 feature revision
hundeboll-silicom d971697
mfd: intel-m10-bmc: add n5010 variant
hundeboll-silicom caac97a
hwmon: intel-m10-bmc-hwmon: add n5010 sensors
hundeboll-silicom deb6305
fpga: intel-m10-bmc-secure: add n5010 device id
hundeboll-silicom e2d20c2
fpga: dfl: implement dfl_dev_get_base_dev()
hundeboll-silicom a545747
net: ethernet: silicom: add n5010-phy driver
hundeboll-silicom 449696c
net: ethernet: silicom: add n5010-hssi driver
hundeboll-silicom b063472
configs: add n5010 defconfig snippet
hundeboll-silicom File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| CONFIG_FPGA_DFL=m | ||
| CONFIG_FPGA_DFL_FME=m | ||
| CONFIG_FPGA_DFL_FME_MGR=m | ||
| CONFIG_FPGA_DFL_FME_BRIDGE=m | ||
| CONFIG_FPGA_DFL_FME_REGION=m | ||
| CONFIG_FPGA_DFL_AFU=m | ||
| CONFIG_FPGA_DFL_SPI_ALTERA=m | ||
| CONFIG_FPGA_DFL_PCI=m | ||
|
|
||
| CONFIG_FPGA_VFIO_MDEV_DFL=m | ||
|
|
||
| CONFIG_FPGA=m | ||
| CONFIG_FPGA_MGR=m | ||
| CONFIG_FPGA_BRIDGE=m | ||
| CONFIG_FPGA_REGION=m | ||
| CONFIG_FPGA_SEC_MGR=m | ||
| CONFIG_IFPGA_M10_BMC_SECURE=m | ||
|
|
||
| CONFIG_SPI=y | ||
| CONFIG_SPI_MASTER=y | ||
| CONFIG_MFD_INTEL_M10_BMC=m | ||
| CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m | ||
|
|
||
| CONFIG_SPI_ALTERA=m | ||
|
|
||
| CONFIG_FIXED_PHY=m | ||
| CONFIG_NET_VENDOR_SILICOM=y | ||
| CONFIG_N5010_HSSI=m | ||
| CONFIG_n5010_PHY=m | ||
|
|
||
| CONFIG_REGMAP_MMIO=m | ||
| CONFIG_REGMAP_INDIRECT_REGISTER=m | ||
| CONFIG_REGMAP_SPI_AVMM=m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -167,6 +167,7 @@ source "drivers/net/ethernet/seeq/Kconfig" | |
| source "drivers/net/ethernet/sfc/Kconfig" | ||
| source "drivers/net/ethernet/sgi/Kconfig" | ||
| source "drivers/net/ethernet/silan/Kconfig" | ||
| source "drivers/net/ethernet/silicom/Kconfig" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this change (and the corresponding Makefile change) be in the previous phy patch, since that is where the silicom sub-directory directory is created? |
||
| source "drivers/net/ethernet/sis/Kconfig" | ||
| source "drivers/net/ethernet/smsc/Kconfig" | ||
| source "drivers/net/ethernet/socionext/Kconfig" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # SPDX-License-Identifier: GPL-2.0-only | ||
| # | ||
| # Silicom network device configuration | ||
| # | ||
|
|
||
| config NET_VENDOR_SILICOM | ||
| bool "Silicom devices" | ||
| default y | ||
| help | ||
| If you have a network (Ethernet) card belonging to this class, say Y. | ||
|
|
||
| Note that the answer to this question doesn't directly affect the | ||
| kernel: saying N will just cause the configurator to skip all | ||
| the questions about Silicom cards. If you say Y, you will be asked for | ||
| your specific card in the following questions. | ||
|
|
||
| if NET_VENDOR_SILICOM | ||
|
|
||
| config N5010_PHY | ||
| tristate "Fixed Phy Driver for Silicom PAC N5010" | ||
| depends on MFD_INTEL_M10_BMC && FIXED_PHY | ||
| help | ||
| The n5010 card consists of a primary FPGA running the network controller, | ||
| and a side-fpga running the board management controller (bmc). This driver | ||
| reads status bits and controls link LEDs via the bmc. | ||
|
|
||
| config N5010_HSSI | ||
| tristate "Control Plane Driver for Silicom PAC N5010 HSSI" | ||
| select N5010_PHY | ||
| select REGMAP_INDIRECT_REGISTER | ||
| help | ||
| This driver provides control plane support for the Silicom N5010 | ||
| Programmable Acceleration Card. This driver adds network interfaces | ||
| for the line-side QFSP modules, supporting various control/status | ||
| operations. | ||
|
|
||
| endif # NET_VENDOR_SILICOM |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # SPDX-License-Identifier: GPL-2.0 | ||
| # | ||
| # Makefile for the Silicom network device drivers. | ||
| # | ||
|
|
||
| obj-$(CONFIG_N5010_PHY) += n5010-phy.o | ||
| obj-$(CONFIG_N5010_HSSI) += n5010-hssi.o |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this unique enough ?
What happens if n3000 revs this feature
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
n3000 uses a different driver, dfl-n3000-nios.c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We did start out with a dedicated n5010 feature id, but changed it to a feature revision after preliminary review from Russ.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what i mean is the {feature id, revision} unique for all cards ? it would see that checking if this was a 5010 card by its pci id was better than checking the revision of a feature a lot of cards share
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe I was the person who suggested a different revision to distinguish the target of the SPI connection. The hardware connected to the DFL bus is the same for the d5005 and the n5010, but the other end of the SPI connection is slightly different. I suggested just bumping the revision because the hardware interface didn't change.
I hadn't thought about using the PCIe device id to distinguish the target of the SPI, but I think that is the wrong approach. DFLs can exist on non-PCIe devices; so writing a DFL driver that depends on a PCIe device ID breaks the layering.