Skip to content

[6.18] Rebase ARM commits from 4.14 kernel - #286

Open
chaitu236 wants to merge 83 commits into
ni:nilrt/master/6.18from
chaitu236:dev/cvadrevu/618_arm
Open

[6.18] Rebase ARM commits from 4.14 kernel#286
chaitu236 wants to merge 83 commits into
ni:nilrt/master/6.18from
chaitu236:dev/cvadrevu/618_arm

Conversation

@chaitu236

@chaitu236 chaitu236 commented Jul 28, 2026 •
edited by ni-github-admins
Loading

Copy link
Copy Markdown
Contributor

Rebase ARM commits from 4.14 kernel.

Majority of commits had merge conflicts or needed updates to be able to build on 6.18 kernel. I've recorded details in commit messages itself.

There are some commits I haven't cherry-picked either due to merge conflicts that required more detailed analysis or due to them failing build.

WI: AB#3966407, AB#3990497, AB#3990492, AB#4000899, AB#4000886

Testing

  • Built ni-pkg target
  • Boot tested resulting .itb on cRIO-9068, sbRIO-9651.
  • Built scarthgap BSI, safemode with this kernel.
  • Boot tested BSI on cRIO-9063, cRIO-9066, cRIO-9068, sbRIO-9607, sbRIO-9651, Elvis RIO CM, Elvis III, roboRIO, myRIO-1900, myRIO-1950, NI-9147, NI-9149, NI-7935.
  • Hardware Manager/MAX can recognize devices and install software.
  • Installed RSS on cRIO-9068 and could run a simple LV VI.
  • Built for x64.
  • Boot tested on x64 VM.

Issues

  • Some warn splats related to ni16550 that needs looking into. Will create WI.

gratian and others added 2 commits June 25, 2026 23:11
@gratian @chaitu236
scripts: Add pre-generated copy for arm-nilrt-linux-gnueabi-elfconfig.h
e1f6c9c 
In preparation for upgrading to gcc 4.7 we need a copy of the pre-generated
header arm-nilrt-linux-gnueabi-elfconfig.h that matches the toolchain prefix.
This file is identical to: arm-none-linux-gnueabi-elfconfig.h

Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
Acked-by: Brad Mouring <brad.mouring@ni.com>
Brad Mouring @chaitu236
scripts: Add pre-generated copy for x86_64
ca1a7bc 
In order to support building the tools needed for on-target versioning for
x86_64 targets (since HOSTCC continues to be x86), adding a pregenerated header
for that toolchain.

Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Gratian Crisan <gratian.crisan@ni.com>
@chaitu236
chaitu236 requested a review from gratian July 28, 2026 01:40
@chaitu236
chaitu236 force-pushed the dev/cvadrevu/618_arm branch from 62bc419 to b9f19b1 Compare July 28, 2026 21:13
@chaitu236

chaitu236 commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

v2: Add /ni-install/ to gitignore.

@chaitu236
chaitu236 force-pushed the dev/cvadrevu/618_arm branch from b9f19b1 to cc2b6fc Compare July 28, 2026 22:16
@chaitu236

chaitu236 commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

v3: Updated some commit messages.

@chaitu236
chaitu236 force-pushed the dev/cvadrevu/618_arm branch from cc2b6fc to 1b1b4f3 Compare July 31, 2026 21:52
@chaitu236

chaitu236 commented Jul 31, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

v4: savedefconfig (which I forgot to do previously). Enabled other configs required for CONFIG_RCU_NOCB_CPU_DEFAULT_ALL in nati_slsc_defconfig, nati_bluefin_defconfig.

Note: It's not yet clear if CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is required in nati_slsc_defconfig, nati_bluefin_defconfig; will remove the changes later if not required.

@chaitu236
chaitu236 requested a review from a team July 31, 2026 21:53
@chaitu236

chaitu236 commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

v5: Cherry-pick few more commits that were left out as part of original rebase due to rebase/build failures. Expanded github-actions to add ARM checks.

@chaitu236

chaitu236 commented Aug 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Note: [TEST] Is rebase required failed due to fetch-depth 100 not being sufficient and not due to this branch not being based on latest nilrt/master/6.18. Not planning to increase fetch-depth as it only becomes a problem during rebases which happen infrequently.

@chaitu236

chaitu236 commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

v6: Disable CONFIG_LOCALVERSION_AUTO so some drivers can compile.

@gratian

gratian commented Aug 5, 2026

Copy link
Copy Markdown

@chaitu236 I am about half way through the list of commits. Here is what I've found so far:

  • The config options added by the commits below are not currently enabled in our defconfigs, ex. nati_zynq_defconfig. We either need to match the 4.14 configs or drop these commits if we decide they are not adding value (preferred option but would require running the kernel performance benchmarks with a network load):

    • "driver core: NI backwards compatibility for device_poll interface"
    • "net: add device_poll functionality common to all net devices"
    • "driver core: add device_poll interface"

  • Please drop commit "watchdog: nic7018_wdt: Add support for timeout interrupt". It is already in tree. The new commit adds a duplicated devm_request_threaded_irq() call right below the one in-tree.

  • Commit "Revert "irqchip/gic: Kill the xlate method"" is part of a set with other "irqchip: gic", currently not cherry-picked.

    • It is supposed to be used with the commits adding CONFIG_GIC_LEGACY_IRQDOMAIN which were not cherry-picked, see AB#3990488 and AB#4000886
    • Consider dropping or cherry picking as a set (if the workaround is needed).

  • The whole set of pl353 set of commits needs a very close review.

    • We need to switch to the in-tree pl35x-nand-controller driver instead of cherry-picking an old out-of-tree Xilinx driver.
    • Bluefin already uses the in-tree pl353 NAND driver. We need to to the same for the rest of the Zynq-based devices. Also see: Rectify Bluefin NAND on-die ECC support (6.12) #229

  • Commit "fpgaperipheral: Add driver to notify clients on FPGA downloads" has some leftover conflict resolution text in drivers/misc/Makefile (still has ">>>>>>> b00bd56 (fpgaperipheral: Add driver to notify clients on FPGA downloads)")

  • From what I can tell the commits below are not needed (one is the logical revert of the other):

    • "nirtfeatures: BIOS writes HARD_BOOT_N, so driver doesn't need to"
    • "nirtfeatures: set HARD_BOOT_N if necessary when the driver loads"

  • Nitpick, commit "shared: Adding mcopy syscall for Zynq and x64" has a white-space alignment issue.

Ben Shelton and others added 16 commits August 7, 2026 14:37
Ben Shelton @chaitu236
shared: Adding mcopy syscall for Zynq
2a6f400 
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Acked-by: Scot Salmon <scot.salmon@ni.com>
Acked-by: Terry Wilcox <terry.wilcox@ni.com>
Natinst-ReviewBoard-ID: 69848
[gratian: convert to new syscall table format for arm]
Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
[cvadrevu: Updated to just add missing Zynq code]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@franram4 @chaitu236
leds-ni793x: Add leds-ni793x driver to control the RT User 1 LED
15f532b 
Add the leds-ni793x driver which controls the RT User 1 LED on the NI-793xR
devices. The RT User 1 LED control is exposed through the Zynq FPGA logic.

Signed-off-by: Francesca Ramadori <francesca.ramadori@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Josh Cartwright <joshc@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com>
[cvadrevu: Fixed trivial conflicts due to newer modules]
[cvadrevu: Updated ni793x_leds_remove signature for newer kernel]
[cvadrevu: Replaced ni793x_leds_ids with ni793x_led_ids]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@franram4 @chaitu236
leds-ni793x: Add documentation for leds-ni793x devicetree bindings
fa4877c 
Add documentation for leds-ni793x devicetree bindings. This driver controls
the RT User1 LED on the FlexRIO NI-793xR devices.

Signed-off-by: Francesca Ramadori <francesca.ramadori@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Josh Cartwright <joshc@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com>
@kteske @chaitu236
fpgaperipheral: Add driver to notify clients on FPGA downloads
1aa48ca 
Clients are drivers for peripherals with physical lines routed through
the FPGA.  Ethernet and serial will want to receive notifications so
they can avoid accessing hardware while the FPGA is unprogrammed.

Signed-off-by: Kyle Teske <kyle.teske@ni.com>
Natinst-ReviewBoard-ID: 26536
[cvadrevu: Fixed trivial conflicts due to newer modules]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
Brad Mouring @chaitu236
fpgaperipheral: Add notification for failure
14bc4f0 
We add a separate notification which will get called when FPGA
programming fails. This is to enable client drivers to know when to stop
waiting for FPGA to come up, if the re-programming fails.

Signed-off-by: Karthik Manamcheri <karthik.manamcheri@ni.com>
Ben Shelton @chaitu236
fpgaperipheral: Add dev_info message if probe succeeded
11a785f 
If fpgaperipheral_probe succeeds, it generates no debug output, even at
the highest loglevel.  Add a success message to make device tree
debugging easier.

Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Josh Cartwright @chaitu236
nizynqcpld: Add support for the NI Zynq CPLD
ab72950 
The NI Zynq prototype board has a CPLD that provides various
board-management capabilities.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Signed-off-by: Jaeden Amero <jaeden.amero@ni.com>
Acked-by: Jeff Westfahl <jeff.westfahl@ni.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
[cvadrevu: Fixed trivial conflicts due to newer module]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
Josh Cartwright @chaitu236
nizynqcpld: Add scratchpad read and write
283027c 
This provides a general purpose, raw interface to the CPLD's scratchpad.
The scratchpad can be used to communicate between soft reboots of the
target.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Josh Cartwright @chaitu236
nizynqcpld: Add 'bootmode' attribute
ef40de5 
This is a read/write attribute that will set the necessary bits in the
scratch registers used to determine which mode the board boots into.
Currently, valid modes are 'runtime', 'safemode', and 'recovery'.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Josh Cartwright @chaitu236
nizynqcpld: Add support for LEDs
476bb39 
Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Signed-off-by: Scot Salmon <scot.salmon@ni.com>
Acked-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Josh Cartwright <josh.cartwright@ni.com>
Natinst-ReviewBoard-ID: 36482
Josh Cartwright @chaitu236
nizynqcpld: Add reboot support
3e1e13e 
Use the SLCR to reboot the zynq if a reset function is not provided.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Acked-by: Jeff Westfahl <jeff.westfahl@ni.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Natinst-ReviewBoard-ID: 90458
Josh Cartwright @chaitu236
nizynqcpld: Add attributes to query switches
277acce 
This will expose the switches as sysfs attributes for consumption by the
RT utilities VIs.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Jeff Westfahl @chaitu236
nizynqcpld: Add NI Watchdog support
ee5b34d 
Add support for the Dos Equis CPLD watchdog, implementing the NI
Watchdog ioctl interface with a misc device.

Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
Signed-off-by: Scot Salmon <scot.salmon@ni.com>
Acked-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Josh Cartwright <josh.cartwright@ni.com>
Natinst-ReviewBoard-ID: 36482
@ioancornea82 @chaitu236
nizynqcpld: Add support for wifi button on myRIO
a92d65b 
Signed-off-by: Ioan Cornea <ioan.cornea@ni.com>
@kengsooncheah @chaitu236
nizynqcpld: Add cRIO-906[6,7] CPLD support
e85181e 
cRIO-906[6,7] (Sol) CPLD requires new driver support since it has a new
version number.  Also, the red and yellow LEDs and wifi LEDs are not
supported.

Signed-off-by: Keng Soon Cheah <keng.soon.cheah@ni.com>
@Patater @chaitu236
nizynqcpld: Add Tecate CPLD support
b8f7df0 
Add support for Tecate sbRIO to the CPLD by adding it to the list of
CPLDs. It uses Sol-style LEDs.

Signed-off-by: Jaeden Amero <jaeden.amero@ni.com>
natesully and others added 28 commits August 7, 2026 18:51
@natesully @chaitu236
macb: deactivate queues in fpga notifier
a4e9ec3 
In order to synchronize macb_stop and macb_start_xmit, turn all the tx
queues off before going down and back on again before going up during
FPGA reloads.  Not synchronizing these functions would result in a crash
during the reload if frames are transmitted.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Zach Brown <zach.brown@ni.com>
Acked-by: James Minor <james.minor@ni.com>
Natinst-ReviewBoard-ID: 218609
Natinst-CAR-ID: 672398
James Minor @chaitu236
wl12xx: Disable uncalibrated channel 14 (not supported on LSR)
5597722 
NI uses a module from LSR that does not have calibration constants
for channel 14.  As such, channel 14 should never be used.

This change is to retain parity with NI's shipped 3.2 kernel for
purposes of compliance, so it should not be upstreamed.

Signed-off-by: James Minor <james.minor@ni.com>
James Minor @chaitu236
wl12xx: Disallow channels above 11 until beacons are seen
c9b1159 
In order to prevent us from sending out anything on channels
that are illegal in some countries, we wait until we see
beacons from the AP before trying to connect on those channels.

This change is to retain parity with NI's shipped 3.2 kernel for
purposes of compliance, so it should not be upstreamed.

Signed-off-by: Tim Ousley <tim.ousley@ni.com>
[reworked for 3.14 branch and for coding style ]
Signed-off-by: James Minor <james.minor@ni.com>
@gratian @chaitu236
wl12xx: Switch to using nl80211_band enum
6aad9ee 
Commit 57fbcce ("cfg80211: remove enum ieee80211_band") upstream
removed the ieee80211_band enum in favour of using the nl80211_band enum
directly. Convert the TI wl12xx driver's use of ieee80211_band to
nl80211_band enum.

Fixes: ce3a405b2e61 ("wl12xx: Disallow channels above 11 until beacons are
seen")

Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
@kroeschl @chaitu236
mmc: core: Wait for Vdd to settle on card power off
2ac42d0 
The SD spec version 6.0 section 6.4.1.5 requires that Vdd must be
lowered to less than 0.5V for a minimum of 1 ms when powering off a
card. Increase our wait to 15 ms so that voltage has time to drain down
to 0.5V.

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: James Minor <james.minor@ni.com>
Acked-by: Brandon Streiff <brandon.streiff@ni.com>
Natinst-ReviewBoard-ID: 203804
@kroeschl @chaitu236
mmc: sdhci: Disable SD card clock before changing parameters
90e2d7c 
Per the SD Host Controller Simplified Specification v4.20 §3.2.3, change
the SD card clock parameters only after first disabling the external card
clock. Doing this fixes a spurious clock pulse on Baytrail and Apollo Lake
SD controllers which otherwise breaks voltage switching with a specific
Swissbit SD card.

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Tony Liechty <tony.liechty@ni.com>
Acked-by: Nathan Sullivan <nathan.sullivan@ni.com>
Natinst-ReviewBoard-ID: 236135
Natinst-CAR-ID: 694815
@kroeschl @chaitu236
mmc: sdhci: Add quirk for delay between clock disable and param change
b297e5f 
Some SD controllers require a delay between clearing SDHCI_CLOCK_CARD_EN
and changing the SD clock dividers in order to avoid a runt clock pulse
which can otherwise cause problems with some SD cards.

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Tony Liechty <tony.liechty@ni.com>
Acked-by: Nathan Sullivan <nathan.sullivan@ni.com>
Natinst-ReviewBoard-ID: 236135
[cvadrevu: Fixed trivial conflicts due to new quirks]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@kroeschl @chaitu236
mmc: sdhci: Add quirk work around double rescan
a79e307 
On some SD host controllers, we can see two SD card insert interrupts when
inserting a card. This causes mmc_rescan() to be called twice in quick
succession and generate one or two SD card clock pulses, which can cause
some SD cards to become unresponsive.

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Tony Liechty <tony.liechty@ni.com>
Acked-by: Nathan Sullivan <nathan.sullivan@ni.com>
Natinst-ReviewBoard-ID: 236135
[gratian: fix conflict with fec7967 ("mmc: sdhci: Factor out sdhci_enable_clk")]
Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
[cvadrevu: Fixed trivial conflicts due to new quirks]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@kroeschl @chaitu236
mmc: sdhci-pci: Use two delay quirks for Baytrail SD
8abeeca 
With the Baytrail SD controllers on cRIO-905x, we can run into two
conditions which cause functional problems with the NI-recommended microSD
card. The first is a runt pulse after SD card clock disable, which is fixed
by using SDHCI_QUIRK2_NEED_DELAY_AFTER_CLK_DISABLE to wait after disabling
the clock. The second is receiving two SDHCI_INT_CARD_INSERT interrupts,
which causes us to set up the card twice a make our recommended microSD
card unresponsive. Work around this by using
SDHCI_QUIRK2_SPURIOUS_CARD_INSERT_INTERRUPT.

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Tony Liechty <tony.liechty@ni.com>
Acked-by: Nathan Sullivan <nathan.sullivan@ni.com>
Natinst-ReviewBoard-ID: 236135
Natinst-CAR-ID: 696865
Natinst-CAR-ID: 694815
Jeff Westfahl @chaitu236
Marvell 88E151x PHY: Configure interrupt output
df5009d 
By default, the interrupt output of the Marvell 88E1512 PHY is
configured as an LED output, and is driven low. If we have a case where
eth1 is brought up before eth0, this causes an interrupt storm, and
Linux eventually gives up and disables the PHY interrupt line. Adding a
probe function to the Marvell 88E1512 PHY driver and moving the
interrupt output configuration there resolves this problem.

[bm: Adjust for d2fa47d 'phy: marvell: Add ethtool statistics counters']

Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
Signed-off-by: Mihaly Varga <mihaly.varga@ni.com>
Acked-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com>
Acked-by: Jaeden Amero <jaeden.amero@ni.com>
Natinst-ReviewBoard-ID: 81627

[bm: Restore correct page on LED/irq config]
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Jeff Westfahl <jeff.westfahl@ni.com>
Natinst-ReviewBoard-ID: 148255

[gratian: split LED pin setup from m88e151x_probe; fixes conflict with 0b04680 ("phy: marvell: Add support for temperature sensor")]
Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
[cvadrevu: Fixed trivial conflict with b697d9d ("net: phy: marvell: add SFP support for 88E1510")]
[cvadrevu: Updated marvell_get_page to marvell_read_page due to 424ca4c ("net: phy: marvell: fix paged access races")]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@kroeschl @chaitu236
mmc: sdhci: Do not disable interrupts in sdhci_set_clock
2ddc35f 
Upstream removed spin lock usage in the set_ios path with commit
d1e4f74 ("mmc: sdhci: Do not use spin lock in set_ios paths"), which
means that our calls to spin_(un)lock_irq() in sdhci_set_clock() now cause
an error on boot if a card is not present or a crash if one is present.
Remove these calls so we don't do that and to match upstream's change.

Fixes: 815777e ("mmc: sdhci: Add quirk for delay between clock disable and param change")
Fixes: 30d2f45 ("mmc: sdhci: Add quirk work around double rescan")

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
Acked-by: Gratian Crisan <gratian.crisan@ni.com>
Acked-by: Brandon Streiff <brandon.streiff@ni.com>
Natinst-ReviewBoard-ID: 264712
Natinst-CAR-ID: 720310
@kimkhiam @chaitu236
nizynqcpld: Add NI roboRIO 2.0 CPLD support
5f9de4b 
NI roboRIO 2.0 has relocated the clock pin from 1.8V bank to 3.3V bank.
Hence, it required to update both product and supported version to indicate the changes in HW.

Signed-off-by: Kim Khiam Lim <kim.khiam.lim@ni.com>
@chaitu236
ARM: dts: ni: Import Zynq device trees from Linux 4.14
2b31af1 
Import the NI Zynq board device trees from the 4.14 kernel and add them
to the Xilinx DTB build list.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
ARM: dts: ni: Remove unused dts
66f6d8e 
These have been superceded by ni-<devicecode>.dts.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
ARM: dts: ni: Adapt boards to the current Zynq hierarchy
b75c712 
The NI device trees were copied from the 4.14 kernel and still reopen
SoC nodes using their old names and hierarchy.  The current Zynq device
tree defines these nodes with labels and uses gpio0 for the GPIO
controller.

Convert the NI board files to extend the existing amba, I2C, SPI, and
ADC nodes through label references.  Update GPIO references from gpio to
gpio0 and move the myRIO I2C and SPI configuration to the corresponding
labeled nodes.

This allows the NI Zynq device trees to compile against the current
zynq-7000.dtsi.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
dts: ni: Define NAND child address format
9de7d26 
Set the address and size cells on the NAND controller so the nand@0 reg
property is parsed correctly.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
dts: ni: Disable inaccessible CoreSight devices
80c2a1e 
The CoreSight blocks are not accessible on NI Zynq targets. Reading
their AMBA identification registers hangs the SoC before any driver
binds.

Disable the nodes to allow the system to boot.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
net: macb: Replace removed PHY interrupt helpers
e6df6df 
phy_start_interrupts, phy_stop_interrupts have been removed in newer
kernel. Replace them with phy_request_interrupt, phy_free_interrupt.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
misc: nizynqcpld: Update I2C driver callbacks
9cb2e8d 
Drop the unused device ID argument from probe and change remove to
return void, matching the current I2C driver callback signatures.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
serial: 8250_ni: Map MMIO registers before probe-time access
e40d2b6 
UPF_IOREMAP defers mapping the register resource until the serial port
is started.  The NI 16550 driver accesses registers during probe to
determine FIFO sizes and configure the PMR, before the port has been
started.

Map the MMIO resource with devm_ioremap() during probe and assign the
result to port->membase so these early register accesses use a valid
mapping.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
nati_zynq_defconfig: Refresh for Linux 6.18
438fd8c 
Port remaining defconfig changes from 4.14 kernel.

Refresh it against Linux 6.18 while retaining the features
required by NI Zynq targets.

Enable PREEMPT_RT, RCU callback offloading, NI platform drivers, and the
networking, USB, storage, filesystem options, etc.
Regenerate the defconfig to account for current symbols and
dependencies.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
nati*defconfig: Enable CONFIG_RCU_NOCB_CPU_DEFAULT_ALL
671e9b8 
Port this change from commit [1] for nati_x86_64_defconfig.

NILRT is currently booted with `rcu_nocbs=all` kernel parameter set.
Enable CONFIG_RCU_NOCB_CPU_DEFAULT_ALL which will allow us to remove
the boot option in the future.

Note that it is still possible to override this option using rcu_nocbs
or nohz_full boot parameters.

[1]: 4d93b1f ("nati_x86_64_defconfig: enable CONFIG_RCU_NOCB_CPU_DEFAULT_ALL")

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
ni-pkg: Add NI FIT image packaging target
d055c78 
Ported from 4.14 and updated to work on 6.18 kernel.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@natesully @chaitu236
net/phy: micrel: Add workaround for autoneg failure
08aa754 
In addition to the issue in 'net/phy: micrel: Add workaround for bad
autoneg', sometimes the micrel KSZ9031 can fail to negotiate at all.
When this happens, the phy will show link partner advertisements but
will not show the link coming up.

To fix this, reset the PHY if it has been down with link partner
advertisements for more than 20 seconds.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Josh Cartwright <josh.cartwright@ni.com>
Acked-by: Tony Liechty <tony.liechty@ni.com>
Natinst-ReviewBoard-ID: 118397

net/phy: micrel: Fix workaround for autoneg failure

The KSZ9031 phy can fail silently during auto-negotiation.
The existing workaround relied on the read_status function being called
periodically, which only happened when the phy state machine polled. Now
that the phy state machine relies only on interrupts the workaround is
broken.

Turning on KSZPHY_INTCS_LINK_PARTNER_ACK will cause read_status to be
called during auto-negotiation. When read_status detects that
auto-negotiation is on going a work queue is started to poll read_status
until the link comes up or the timeout lapses. If the timeout lapses the
phy is reset by calling init_hw and then config_intr.

Fixes: 223f452 ("net/phy: micrel: Add workaround for autoneg failure")
Signed-off-by: Zach Brown <zach.brown@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Kyle Roeschley <kyle.roeschley@ni.com>
Acked-by: Nathan Sullivan <nathan.sullivan@ni.com>
Natinst-ReviewBoard-ID: 197765
Natinst-CAR-ID: 632383
(bmouring: fix small conflict)

[gratian: re-work for e6a423a ("net: phy: micrel: add device-type abstraction") to use the new common 'struct kszphy_priv']
Signed-off-by: Gratian Crisan <gratian.crisan@ni.com>
[cvadrevu: Fixed trivial conflicts due to
   ece1950 ("net: phy: micrel: 1588 support for LAN8814 phy"),
   58389c0 ("net: phy: micrel: ksz9031/ksz9131: add cabletest support")]
[cvadrevu: Adapt to current phylib by using linkmode_empty() for
   lp_advertising and replacing the removed PHY_STATE_TIME with an
   explicit one-second polling interval.]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@natesully @chaitu236
net/phy: micrel: Init workaround work in probe
3fcd2ea 
Do not re-initialize maybe active work in the function the work
handler will call.

fixes: 8f9d74e ("net/phy: micrel: Fix workaround for autoneg failure")
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Jeff Westfahl @chaitu236
macb: Send link speed to the PL via GPIOs
e20f204 
Added support for an EMIO GPIO for telling the GMII-RGMII conversion
logic in the PL what the link speed is. This is necessary for 1Gb
Ethernet to work on many NI targets.

These changes also magically fix the secondary Ethernet speed LED.

Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
Signed-off-by: Jaeden Amero <jaeden.amero@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com>
Acked-by: Gratian Crisan <gratian.crisan@ni.com>
Natinst-ReviewBoard-ID: 84563
(joshc: updated to use gpiod_* APIs)
(bm: update to gpiod_* APIs)
Signed-off-by: Josh Cartwright <joshc@ni.com>
[cvadrevu: Port link-speed GPIO handling to phylink callbacks, add the
           GPIO consumer include, and fix probe error-path cleanup]
Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
github-actions: Add ARM checks
9395807 
Install the ARM cross-compiler and U-Boot tools, build and validate
Zynq, Bluefin, and SLSC defconfigs. Use separate output
directories for all platform builds to avoid artifact conflicts.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
nati*defconfig: Disable CONFIG_LOCALVERSION_AUTO
d2be60b 
Prevent git commit IDs from being appended to kernel release string.
This is needed for some NI drivers to build.

Signed-off-by: Chaitanya Vadrevu <chaitanya.vadrevu@emerson.com>
@chaitu236
chaitu236 force-pushed the dev/cvadrevu/618_arm branch from 68ddbbb to d2be60b Compare August 8, 2026 00:07
@chaitu236

chaitu236 commented Aug 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@gratian

v7: Resolved review feedback

The config options added by the commits below are not currently enabled in our defconfigs, ex. nati_zynq_defconfig. We either need to match the 4.14 configs or drop these commits if we decide they are not adding value (preferred option but would require running the kernel performance benchmarks with a network load):

Dropped. Added them to AB#3990492 for further evaluation.

Please drop commit "watchdog: nic7018_wdt: Add support for timeout interrupt". It is already in tree. The new commit adds a duplicated devm_request_threaded_irq() call right below the one in-tree.

Done

Commit "Revert "irqchip/gic: Kill the xlate method"" is part of a set with other "irqchip: gic", currently not cherry-picked.

Dropped. Added to AB#3990488.

The whole set of pl353 set of commits needs a very close review.

It appears that we didn't have it's config enabled in 6.18 so we weren't using it anyway. Dropped all these commits

mtd: nand: pl353: Use mtd_ooblayout_xxx() helpers
mtd: nand: pl353: Convert nand_ecclayout structs to mtd_ooblayout_ops
pl353_nand: Add dsb(st) (store-only data sync barrier) after reg writes
pl353_nand: Add module params to disable subpage read and write
nand: pl353: Fix private data's use of mtd_info
mtd: nand: xilinx: Rename the pl353 NAND driver to match bootloader
Xilinx: ARM: nand: Deassert CS when the chip is no longer in use
Xilinx: ARM: nand: Check read status when using on-die ECC
Xilinx: ARM: nand: Replace READ0 of the last read page with RNDOUT
Zynq NAND: enable subpage reads and writes
mtd: nand: pl353: add snapshot of driver from linux-xlnx tree
HACK: ARM: zynq: established early fixed mapping for PL353 NAND region

Commit "fpgaperipheral: Add driver to notify clients on FPGA downloads" has some leftover conflict resolution text in drivers/misc/Makefile (still has ">>>>>>> b00bd56 (fpgaperipheral: Add driver to notify clients on FPGA downloads)")

Fixed

From what I can tell the commits below are not needed (one is the logical revert of the other):

Dropped both

Nitpick, commit "shared: Adding mcopy syscall for Zynq and x64" has a white-space alignment issue.

Fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gratian gratian Awaiting requested review from gratian

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.