This is a rebase of our commits from nilrt/master/6.0 to the latest stable-rt/v6.1-rt branch (currently at version v6.1.12-rt7).
Clean-up before rebase:
drop all commits that were reverted in 6.0:
2f740513bbec0b97bbd7520e7aa82fc563602e1e ("e1000e: Add delays after writing to registers") and 7509c5ab563f0bfa10bd8d8491d4d8d47d3bab0a ("Revert "e1000e: Add delays after writing to registers"")
9df507585bfb857f5f22918fccee2c1b5f813064 ("irq: Add priority support to /proc/irq/../") and 482aabeac2cd5a10a4acae35eb94604b2e9040ac ("Revert "irq: Add priority support to /proc/irq/../"")
ba93f2d13b341a4ee3025f5ba645e585c582b094 ("8250: Make SERIAL_8250_RUNTIME_UARTS work correctly") and 37d2b6b784cdebda90ef38e5b2047406dcf9519d ("Revert "8250: Make SERIAL_8250_RUNTIME_UARTS work correctly"), replaced with 2f722caecd547353ec47758cc9186567a61b125a ("8250: Do not create ttyS* nodes for nonexistant devices")
0d1ed2d7adc16a0d9d604332dbbbd4895449730e ("Revert "serial: 8250: Do nothing if nr_uarts=0"") and fa62838d710a3a23685d02527c30f36f0758fea7 ("Revert "Revert "serial: 8250: Do nothing if nr_uarts=0"""), replaced with 2f722caecd547353ec47758cc9186567a61b125a ("8250: Do not create ttyS* nodes for nonexistant devices")
d8cffba0a558588322a375dcf821b2fb700e0c73 ("nati_x86_64_defconfig: use new 8250_ni driver")
a2194764fbdce68dc9b6ec6c2d0d20d571ded6f7 ("nati_x86_64_defconfig: Add support for additional storage features")
Verified that the clean-up did not accidentally dropped or introduced any changes via git diff origin/nilrt/master/6.0 which resulted in an empty diff.
Dropped old NI serial patches in favor of new driver introduced by PR #100:
2d4c94552f56c5b3a1c95d7ad0cb74c677bb71c8 ("serial_core: Provide a transceiver interface")
8e9e459351196dcca1bb636c44b84a0a3494c6ea ("8250: Allow client drivers to control transceivers")
a07f2496f126bcda7ebdae2a6f0891cf166f7138 ("8250: Add a driver for NI 16550 UART")
6fbc61e57e128b395b7515bf7f17d228ee87b5d1 ("8250_pnp: Make NIC7750 ID spawn a NI 16550 port")
053fe96f7114a1c1e45e627f62e33ac0fc3d5ca1("8250_pnp: NI ACPI IDs start with NIC")
8d2f96d747ef273578694344833712a5935124b6 ("8250_pnp: Support dual-mode UART through PMR")
7e4f38dcf35eb933c209886dd9274eda0aca24f4 ("8250: NI 16550 can have different FIFO sizes")
806fb0d47a159012bbfa9a2e782b1e067069f58a ("8250_pnp: Provide NI_16BYTE_FIFO flag")
46312fa9d499beb2b5a74865d24e17809d46d007 ("8250_pnp: Make NIC7772 spawn a dual-mode UART")
0e6bbe347f26162e292af50e217c61da43135149 ("ACPI / PNP: Add IDs for NI 16550 to list")
3089f71dadd4285a8a50f56bb17693ced2f1a449 ("8250_pnp: Add new ID NIC792B for NI 16550 UART 25MHz")
266b84da248697bb4fc6773aafda1f61601b3790 ("serial: 8250_ni16550: Add support for NIC7A69")
bb3aac8e69754581ab4afd549bc2be0219b4da35 ("8250: Use proper set_mctrl callback for ni16550 clock divider")
d0e236dcb51bf5a2e49e8f619665bb8e5ac33ca2 ("8250_ni16550: fix compiler warning about mixed declarations and code")
145e8921120b60b4eb1add6069e365458d5bd5e8 ("8250_ni16550: pass termios as param to ni16550_config_rs485")
0c6d2b6e278c62d3e80955b2fa240e88df33237c ("8250: make disabling CONFIG_SERIAL_8250_NI16550 work correctly")
119264a73acd73856121b44f85ff6a39f8eb4d21 ("8250: Mark txvr_ops as a deprecated interface")
Rebased on top of stable-rt/v6.1-rt branch and fixed the following conflicts in-place:
fix trivial conflict between 11b82590f328cfccc3c21624ef6a107f51dacafe ("kernel: Providing API to allow userland programs to request a cold or warm reboot") and upstream commit ceea991a019c57a1fb0edd12a5f836a0fa431aee ("bpf: Move bpf_dispatcher function out of ftrace locations")
fix trivial conflict between b0c11688fc7c2715c0cb39256dd2674837be6f33 ("time: Make the clocksource watchdog user configurable") and upstream commit 7cf8f44a5a1c0cb10a594996797e5a988cf0589d ("x86: fs: kmsan: disable CONFIG_DCACHE_WORD_ACCESS")
fix trivial conflict between a803e305776e6be805d077d2a9c3b9126cf0bdc9 ("nirtfeatures: Added NI RT features driver") and upstream commit 393fc2f5948fd340d016a9557eea6e1ac2f6c60c ("misc: microchip: pci1xxxx: load auxiliary bus driver for the PIO function in the multi-function endpoint of pci1xxxx device.")
adjust quirk bit flag for commit 3d0d944640e0edbf6bbe7f7587a07fcc674b6173 ("mmc: sdhci: Add quirk for delay between clock disable and param change") due to upstream commit 43e5c20a8b44637da25a2629ca0915467b954bf2 ("mmc: sdhci-tegra: Issue CMD and DAT resets together")
minor change to renumber the flag bit in commit 5ad6479db85134a86e80469a04a0dfe3a6f303ce ("mmc: sdhci: Add quirk work around double rescan")
Testing:
[x] boot tested on cRIO-9042.
[x] diffed .config against 6.0 version; no unexplained or unusual config changes noticed.
[x] diffed dmesg output versus 6.0 version on cRIO-9042; no new errors detected.
[x] basic peripheral functionality validation.
[x] checked out-of-tree module re-versioning via dkms. One error observed which will be handled separately in bug #2364501
[x] OS level performance tests
Procedural notes:
We will want to complete this pull request outside the github UI to create the proper nilrt/master/6.1 branch
The open bug #2364501 should not block the completion of this PR since the fix is contained to the out-of-tree module and this branch is not yet used in the OpenEmbedded recipes (i.e. it will not affect clients at this point).
The linux-stable tree 6.1 branch has additional changes that are not yet present in linux-stable-rt. We will handle that upgrade as a separate PR after this rebase is complete.
bstreiff
commented
1 year ago
This is a rebase of our commits from nilrt/master/6.0 to the latest stable-rt/v6.1-rt branch (currently at version v6.1.12-rt7).
Clean-up before rebase:
drop all commits that were reverted in 6.0:
reorder commits that logically belong together
squashed accumulated defconfig changes:
Verified that the clean-up did not accidentally dropped or introduced any changes via
git diff origin/nilrt/master/6.0which resulted in an empty diff.Dropped old NI serial patches in favor of new driver introduced by PR #100:
Rebased on top of stable-rt/v6.1-rt branch and fixed the following conflicts in-place:
Testing:
.configagainst 6.0 version; no unexplained or unusual config changes noticed.Procedural notes:
linux-stabletree 6.1 branch has additional changes that are not yet present inlinux-stable-rt. We will handle that upgrade as a separate PR after this rebase is complete.