Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ptp: ocp: adjust sysfs entries to expose tty information

Implement additional attribute group to expose serial port information.
Fixes tag points to the commit which introduced the change in serial
port subsystem and made it impossible to use symlinks.

Fixes: b286f4e87e32 ("serial: core: Move tty and serdev to be children of serial core port device")
Signed-off-by: Vadim Fedorenko <vadfed@meta.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Vadim Fedorenko and committed by
Paolo Abeni
82ace0c8 d7875b4b

+51 -11
+51 -11
drivers/ptp/ptp_ocp.c
··· 3362 3362 static EXT_ATTR_RO(freq, frequency, 3); 3363 3363 3364 3364 static ssize_t 3365 + ptp_ocp_tty_show(struct device *dev, struct device_attribute *attr, char *buf) 3366 + { 3367 + struct dev_ext_attribute *ea = to_ext_attr(attr); 3368 + struct ptp_ocp *bp = dev_get_drvdata(dev); 3369 + 3370 + return sysfs_emit(buf, "ttyS%d", bp->port[(uintptr_t)ea->var].line); 3371 + } 3372 + 3373 + static umode_t 3374 + ptp_ocp_timecard_tty_is_visible(struct kobject *kobj, struct attribute *attr, int n) 3375 + { 3376 + struct ptp_ocp *bp = dev_get_drvdata(kobj_to_dev(kobj)); 3377 + struct ptp_ocp_serial_port *port; 3378 + struct device_attribute *dattr; 3379 + struct dev_ext_attribute *ea; 3380 + 3381 + if (strncmp(attr->name, "tty", 3)) 3382 + return attr->mode; 3383 + 3384 + dattr = container_of(attr, struct device_attribute, attr); 3385 + ea = container_of(dattr, struct dev_ext_attribute, attr); 3386 + port = &bp->port[(uintptr_t)ea->var]; 3387 + return port->line == -1 ? 0 : 0444; 3388 + } 3389 + 3390 + #define EXT_TTY_ATTR_RO(_name, _val) \ 3391 + struct dev_ext_attribute dev_attr_tty##_name = \ 3392 + { __ATTR(tty##_name, 0444, ptp_ocp_tty_show, NULL), (void *)_val } 3393 + 3394 + static EXT_TTY_ATTR_RO(GNSS, PORT_GNSS); 3395 + static EXT_TTY_ATTR_RO(GNSS2, PORT_GNSS2); 3396 + static EXT_TTY_ATTR_RO(MAC, PORT_MAC); 3397 + static EXT_TTY_ATTR_RO(NMEA, PORT_NMEA); 3398 + static struct attribute *ptp_ocp_timecard_tty_attrs[] = { 3399 + &dev_attr_ttyGNSS.attr.attr, 3400 + &dev_attr_ttyGNSS2.attr.attr, 3401 + &dev_attr_ttyMAC.attr.attr, 3402 + &dev_attr_ttyNMEA.attr.attr, 3403 + NULL, 3404 + }; 3405 + 3406 + static const struct attribute_group ptp_ocp_timecard_tty_group = { 3407 + .name = "tty", 3408 + .attrs = ptp_ocp_timecard_tty_attrs, 3409 + .is_visible = ptp_ocp_timecard_tty_is_visible, 3410 + }; 3411 + 3412 + static ssize_t 3365 3413 serialnum_show(struct device *dev, struct device_attribute *attr, char *buf) 3366 3414 { 3367 3415 struct ptp_ocp *bp = dev_get_drvdata(dev); ··· 3838 3790 3839 3791 static const struct ocp_attr_group fb_timecard_groups[] = { 3840 3792 { .cap = OCP_CAP_BASIC, .group = &fb_timecard_group }, 3793 + { .cap = OCP_CAP_BASIC, .group = &ptp_ocp_timecard_tty_group }, 3841 3794 { .cap = OCP_CAP_SIGNAL, .group = &fb_timecard_signal0_group }, 3842 3795 { .cap = OCP_CAP_SIGNAL, .group = &fb_timecard_signal1_group }, 3843 3796 { .cap = OCP_CAP_SIGNAL, .group = &fb_timecard_signal2_group }, ··· 3878 3829 3879 3830 static const struct ocp_attr_group art_timecard_groups[] = { 3880 3831 { .cap = OCP_CAP_BASIC, .group = &art_timecard_group }, 3832 + { .cap = OCP_CAP_BASIC, .group = &ptp_ocp_timecard_tty_group }, 3881 3833 { }, 3882 3834 }; 3883 3835 ··· 3906 3856 3907 3857 static const struct ocp_attr_group adva_timecard_groups[] = { 3908 3858 { .cap = OCP_CAP_BASIC, .group = &adva_timecard_group }, 3859 + { .cap = OCP_CAP_BASIC, .group = &ptp_ocp_timecard_tty_group }, 3909 3860 { .cap = OCP_CAP_SIGNAL, .group = &fb_timecard_signal0_group }, 3910 3861 { .cap = OCP_CAP_SIGNAL, .group = &fb_timecard_signal1_group }, 3911 3862 { .cap = OCP_CAP_FREQ, .group = &fb_timecard_freq0_group }, ··· 4412 4361 { 4413 4362 struct pps_device *pps; 4414 4363 char buf[32]; 4415 - int i; 4416 - 4417 - for (i = 0; i < __PORT_COUNT; i++) { 4418 - if (bp->port[i].line != -1) { 4419 - sprintf(buf, "ttyS%d", bp->port[i].line); 4420 - ptp_ocp_link_child(bp, buf, ptp_ocp_tty_port_name(i)); 4421 - } 4422 - } 4423 4364 4424 4365 sprintf(buf, "ptp%d", ptp_clock_index(bp->ptp)); 4425 4366 ptp_ocp_link_child(bp, buf, "ptp"); ··· 4483 4440 { 4484 4441 struct device *dev = &bp->dev; 4485 4442 4486 - sysfs_remove_link(&dev->kobj, "ttyGNSS"); 4487 - sysfs_remove_link(&dev->kobj, "ttyGNSS2"); 4488 - sysfs_remove_link(&dev->kobj, "ttyMAC"); 4489 4443 sysfs_remove_link(&dev->kobj, "ptp"); 4490 4444 sysfs_remove_link(&dev->kobj, "pps"); 4491 4445 }