Skip to content

Commit f237cdd

Browse files
author
Herton R. Krzesinski
committed
Merge: ice: Enable GNSS write capability
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1938 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2111048 Series enable GNSS write capability and switch to GNSS subsystem instead of TTY Signed-off-by: Petr Oros <poros@redhat.com> Approved-by: Michal Schmidt <mschmidt@redhat.com> Approved-by: Kamal Heib <kheib@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 8951aa3 + 38075af commit f237cdd

File tree

6 files changed

+299
-176
lines changed

6 files changed

+299
-176
lines changed

Documentation/networking/device_drivers/ethernet/intel/ice.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,17 @@ To enable/disable UDP Segmentation Offload, issue the following command::
902902
# ethtool -K <ethX> tx-udp-segmentation [off|on]
903903

904904

905+
GNSS module
906+
-----------
907+
Requires kernel compiled with CONFIG_GNSS=y or CONFIG_GNSS=m.
908+
Allows user to read messages from the GNSS hardware module and write supported
909+
commands. If the module is physically present, a GNSS device is spawned:
910+
``/dev/gnss<id>``.
911+
The protocol of write command is dependent on the GNSS hardware module as the
912+
driver writes raw bytes by the GNSS object to the receiver through i2c. Please
913+
refer to the hardware GNSS module documentation for configuration details.
914+
915+
905916
Performance Optimization
906917
========================
907918
Driver defaults are meant to fit a wide variety of workloads, but if further

drivers/net/ethernet/intel/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,9 @@ config ICE_HWTS
337337
the PTP clock driver precise cross-timestamp ioctl
338338
(PTP_SYS_OFFSET_PRECISE).
339339

340+
config ICE_GNSS
341+
def_bool GNSS = y || GNSS = ICE
342+
340343
config FM10K
341344
tristate "Intel(R) FM10000 Ethernet Switch Host Interface Support"
342345
default n

drivers/net/ethernet/intel/ice/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ ice-$(CONFIG_PCI_IOV) += \
4242
ice_vf_vsi_vlan_ops.o \
4343
ice_vf_lib.o
4444
ice-$(CONFIG_PTP_1588_CLOCK) += ice_ptp.o ice_ptp_hw.o
45-
ice-$(CONFIG_TTY) += ice_gnss.o
4645
ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o
4746
ice-$(CONFIG_RFS_ACCEL) += ice_arfs.o
4847
ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o
4948
ice-$(CONFIG_ICE_SWITCHDEV) += ice_eswitch.o
49+
ice-$(CONFIG_ICE_GNSS) += ice_gnss.o

drivers/net/ethernet/intel/ice/ice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <linux/avf/virtchnl.h>
4040
#include <linux/cpu_rmap.h>
4141
#include <linux/dim.h>
42+
#include <linux/gnss.h>
4243
#include <net/pkt_cls.h>
4344
#include <net/tc_act/tc_mirred.h>
4445
#include <net/tc_act/tc_gact.h>
@@ -543,9 +544,8 @@ struct ice_pf {
543544
struct mutex adev_mutex; /* lock to protect aux device access */
544545
u32 msg_enable;
545546
struct ice_ptp ptp;
546-
struct tty_driver *ice_gnss_tty_driver;
547-
struct tty_port gnss_tty_port;
548547
struct gnss_serial *gnss_serial;
548+
struct gnss_device *gnss_dev;
549549
u16 num_rdma_msix; /* Total MSIX vectors for RDMA driver */
550550
u16 rdma_base_vector;
551551

0 commit comments

Comments
 (0)