Skip to content
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

Pci serial patch #165

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Pci serial patch #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f86bafa
pci: Remove igc produt config
xiaoxiang781216 Nov 16, 2024
03674de
serial/pci: Remove the product specific config
xiaoxiang781216 Nov 16, 2024
da281ce
arch/sim: Chagne ASSERT to assert in posix/sim_macho_init.c.
xiaoxiang781216 Nov 17, 2024
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
4 changes: 2 additions & 2 deletions arch/sim/src/sim/posix/sim_macho_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static void save_and_replace_init_funcs(int argc, const char *argv[],
init_func_t *fp;
unsigned int nfuncs = &mod_init_func_end - &mod_init_func_start;

ASSERT(nfuncs > 0);
assert(nfuncs > 0);
g_num_saved_init_funcs = nfuncs - 1;
if (g_num_saved_init_funcs == 0)
{
Expand All @@ -102,7 +102,7 @@ static void save_and_replace_init_funcs(int argc, const char *argv[],
{
if (*fp == save_and_replace_init_funcs)
{
ASSERT(i == 0);
assert(i == 0);
}
else
{
Expand Down
1 change: 0 additions & 1 deletion boards/x86_64/intel64/qemu-intel64/configs/nsh_pci/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ CONFIG_16550_PCI_UART0_DEVICE=0x9100
CONFIG_16550_PCI_UART0_SERIAL_CONSOLE=y
CONFIG_16550_PCI_UART0_VENDOR=0x125b
CONFIG_16550_PCI_UART=y
CONFIG_16550_PCI_UART_AX99100=y
CONFIG_ARCH="x86_64"
CONFIG_ARCH_BOARD="qemu-intel64"
CONFIG_ARCH_BOARD_INTEL64_QEMU=y
Expand Down
1 change: 0 additions & 1 deletion boards/x86_64/intel64/qemu-intel64/configs/nsh_pci_smp/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ CONFIG_16550_PCI_UART0_DEVICE=0x9100
CONFIG_16550_PCI_UART0_SERIAL_CONSOLE=y
CONFIG_16550_PCI_UART0_VENDOR=0x125b
CONFIG_16550_PCI_UART=y
CONFIG_16550_PCI_UART_AX99100=y
CONFIG_ARCH="x86_64"
CONFIG_ARCH_BOARD="qemu-intel64"
CONFIG_ARCH_BOARD_INTEL64_QEMU=y
Expand Down
6 changes: 5 additions & 1 deletion boards/x86_64/intel64/qemu-intel64/configs/pcitest/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
# modifications.
#
CONFIG_16550_ADDRWIDTH=16
CONFIG_16550_PCI_UART1=y
CONFIG_16550_PCI_UART1_CLOCK=1843200
CONFIG_16550_PCI_UART1_DEVICE=0x0002
CONFIG_16550_PCI_UART1_VENDOR=0x1b36
CONFIG_16550_PCI_UART=y
CONFIG_16550_UART0=y
CONFIG_16550_UART0_BASE=0x3f8
CONFIG_16550_UART0_CLOCK=1843200
Expand Down Expand Up @@ -54,7 +59,6 @@ CONFIG_NET_E1000=y
CONFIG_NET_ETH_PKTSIZE=1514
CONFIG_NET_ICMP_SOCKET=y
CONFIG_NET_IGC=y
CONFIG_NET_IGC_I225LM=y
CONFIG_NET_LL_GUARDSIZE=32
CONFIG_NET_MAX_LISTENPORTS=8
CONFIG_NET_PKT=y
Expand Down
8 changes: 0 additions & 8 deletions drivers/net/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,14 +796,6 @@ config NET_IGC_RXSPARE
int "Intel IGC spare RX buffers"
default 8

config NET_IGC_I225LM
bool "Intel I225LM"
default n

config NET_IGC_I226V
bool "Intel I226V"
default n

endif # NET_IGC

endif # NETDEVICES
10 changes: 0 additions & 10 deletions drivers/net/igc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,40 +207,30 @@ static int igc_probe(FAR struct pci_device_s *dev);
* Private Data
*****************************************************************************/

#ifdef CONFIG_NET_IGC_I225LM
/* Intel I225LM */

static const struct igc_type_s g_igc_i225lm =
{
.desc_align = 128,
.mta_regs = 128
};
#endif

#ifdef CONFIG_NET_IGC_I226V
/* Intel I226V */

static const struct igc_type_s g_igc_i226v =
{
.desc_align = 128,
.mta_regs = 128
};
#endif

static const struct pci_device_id_s g_igc_id_table[] =
{
#ifdef CONFIG_NET_IGC_I225LM
{
PCI_DEVICE(0x8086, 0x15f2),
.driver_data = (uintptr_t)&g_igc_i225lm
},
#endif
#ifdef CONFIG_NET_IGC_I226V
{
PCI_DEVICE(0x8086, 0x125c),
.driver_data = (uintptr_t)&g_igc_i226v
},
#endif
{ }
};

Expand Down
13 changes: 0 additions & 13 deletions drivers/serial/Kconfig-pci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@ config 16550_PCI_UART3
---help---
Support for PCI UART3, will be registered as /dev/ttyS3

config 16550_PCI_UART_QEMU
bool "16550 PCI QEMU devices"
default n
---help---
Enable support for QEMU serial devices (pci-serial, pci-serial-2x
pci-serial-4x)

config 16550_PCI_UART_AX99100
bool "16550 PCI AX99100 device"
default n
---help---
Enable support for AX99100 serial port device.

endif # 16550_PCI_UART

if 16550_PCI_UART0
Expand Down
9 changes: 0 additions & 9 deletions drivers/serial/uart_pci_16550.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ static int pci_u16550_probe(FAR struct pci_device_s *dev);
* Private Data
*****************************************************************************/

#ifdef CONFIG_16550_PCI_UART_QEMU

static const struct pci_u16550_type_s g_pci_u16550_qemu_x1 =
{
.ports = 1,
Expand All @@ -143,20 +141,16 @@ static const struct pci_u16550_type_s g_pci_u16550_qemu_x4 =
.regincr = 1,
.portincr = 8,
};
#endif /* CONFIG_16550_PCI_UART_QEMU */

#ifdef CONFIG_16550_PCI_UART_AX99100
static const struct pci_u16550_type_s g_pci_u16550_ax99100_x2 =
{
.ports = 2,
.regincr = 1,
.portincr = 8,
};
#endif /* CONFIG_16550_PCI_UART_AX99100 */

static const struct pci_device_id_s g_pci_u16550_id_table[] =
{
#ifdef CONFIG_16550_PCI_UART_QEMU
{
PCI_DEVICE(0x1b36, 0x0002),
.driver_data = (uintptr_t)&g_pci_u16550_qemu_x1
Expand All @@ -169,13 +163,10 @@ static const struct pci_device_id_s g_pci_u16550_id_table[] =
PCI_DEVICE(0x1b36, 0x0004),
.driver_data = (uintptr_t)&g_pci_u16550_qemu_x4
},
#endif
#ifdef CONFIG_16550_PCI_UART_AX99100
{
PCI_DEVICE(0x125b, 0x9100),
.driver_data = (uintptr_t)&g_pci_u16550_ax99100_x2
},
#endif
{ }
};

Expand Down
Loading