Skip to content

support ET3000 on kernel 6.1.67 #2

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: ET2500_kernel_6.1.67
Choose a base branch
from
Open

support ET3000 on kernel 6.1.67 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 linux.config → ET2500.config
View file
Open in desktop
File renamed without changes.
6,967 changes: 6,967 additions & 0 deletions ET3000.config
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions drivers/net/ethernet/intel/igb/igb_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2280,6 +2280,34 @@ static void igb_set_i2c_bb(struct e1000_hw *hw)
}
#endif

#if 1
/* add by zqt*/
static void e1000_register_set(struct e1000_hw *hw)
{
u32 status;
status = rd32(E1000_CTRL);
status |= E1000_CTRL_FD | E1000_CTRL_SLU | E1000_CTRL_FRCSPD |
E1000_CTRL_FRCDPX | E1000_CTRL_SPD_1000;
status |= E1000_CTRL_SLU;
status &= ~(E1000_CTRL_RFCE | E1000_CTRL_TFCE | E1000_CTRL_SPD_100);
wr32(E1000_CTRL, status);

status = rd32(E1000_PCS_LCTL);
status |= E1000_PCS_LCTL_FSD |
E1000_PCS_LCTL_FORCE_FCTRL |
E1000_PCS_LCTL_FDV_FULL |
E1000_PCS_LCTL_FSV_1000 |
E1000_PCS_LCTL_FORCE_LINK |
E1000_PCS_LCTL_FLV_LINK_UP;
status &= ~(E1000_PCS_LCTL_AN_ENABLE | E1000_PCS_LCTL_AN_TIMEOUT);
wr32(E1000_PCS_LCTL, status);

status = rd32(E1000_CONNSW);
status &= ~(E1000_CONNSW_ENRGSRC);
wr32(E1000_CONNSW, status);
}
#endif

void igb_reset(struct igb_adapter *adapter)
{
struct pci_dev *pdev = adapter->pdev;
Expand Down Expand Up @@ -3493,6 +3521,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
device_set_wakeup_enable(&adapter->pdev->dev,
adapter->flags & IGB_FLAG_WOL_SUPPORTED);

// /* additional configuration by zqt*/
e1000_register_set(hw);

/* reset the hardware with the new settings */
igb_reset(adapter);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ static int npc_update_dmac_value(struct rvu *rvu, int npcblkaddr,

npc_update_entry(rvu, NPC_DMAC, entry,
ether_addr_to_u64(pfvf->mac_addr), 0,
0xffffffffffffull, 0, intf);
0x000000000000ull, 0, intf);

write_req.hdr.pcifunc = rule->owner;
write_req.entry = rule->entry;
Expand Down
8 changes: 8 additions & 0 deletions drivers/pci/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,14 @@ config PCI_HOST_THUNDER_PEM
help
Say Y here if you want PCIe support for CN88XX Cavium Thunder SoCs.

config PCI_HOST_OCTEONTX2_PEM
bool "Marvell OcteonTX2 PCIe controller to off-chip devices"
depends on ARM64
depends on OF
select PCI_HOST_COMMON
help
Say Y here if you want PCIe support for CN9XXX Marvell OcteonTX2 SoCs.

config PCI_HOST_OCTEONTX_ECAM
bool "Cavium Octeontx ECAM controller to on-chip devices on 83xx silicon"
depends on OF && ARM64
Expand Down
1 change: 1 addition & 0 deletions drivers/pci/controller/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
obj-$(CONFIG_PCIE_RCAR_HOST) += pcie-rcar.o pcie-rcar-host.o
obj-$(CONFIG_PCIE_RCAR_EP) += pcie-rcar.o pcie-rcar-ep.o
obj-$(CONFIG_PCI_HOST_OCTEONTX2_PEM) += pci-octeontx2-pem.o
obj-$(CONFIG_PCI_HOST_OCTEONTX_ECAM) += pci-octeontx-ecam.o
obj-$(CONFIG_PCI_HOST_COMMON) += pci-host-common.o
obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o
Expand Down
Loading