Wed Apr 22 14:26:27 2020 UTC ()
show the 'interrupting at ...' info on boot


(jdolecek)
diff -r1.99 -r1.100 src/sys/dev/pci/if_msk.c
cvs diff -r1.99 -r1.100 src/sys/dev/pci/if_msk.c (expand / switch to unified diff)

--- src/sys/dev/pci/if_msk.c 2020/04/18 17:31:52 1.99
+++ src/sys/dev/pci/if_msk.c 2020/04/22 14:26:27 1.100
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_msk.c,v 1.99 2020/04/18 17:31:52 jakllsch Exp $ */ 1/* $NetBSD: if_msk.c,v 1.100 2020/04/22 14:26:27 jdolecek Exp $ */
2/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */ 2/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 1997, 1998, 1999, 2000 5 * Copyright (c) 1997, 1998, 1999, 2000
6 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. 6 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -42,27 +42,27 @@ @@ -42,27 +42,27 @@
42 * purpose with or without fee is hereby granted, provided that the above 42 * purpose with or without fee is hereby granted, provided that the above
43 * copyright notice and this permission notice appear in all copies. 43 * copyright notice and this permission notice appear in all copies.
44 * 44 *
45 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 45 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
46 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 46 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
47 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 47 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
48 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 48 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
49 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 49 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
50 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 50 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
51 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 51 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
52 */ 52 */
53 53
54#include <sys/cdefs.h> 54#include <sys/cdefs.h>
55__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.99 2020/04/18 17:31:52 jakllsch Exp $"); 55__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.100 2020/04/22 14:26:27 jdolecek Exp $");
56 56
57#include <sys/param.h> 57#include <sys/param.h>
58#include <sys/systm.h> 58#include <sys/systm.h>
59#include <sys/sockio.h> 59#include <sys/sockio.h>
60#include <sys/mbuf.h> 60#include <sys/mbuf.h>
61#include <sys/malloc.h> 61#include <sys/malloc.h>
62#include <sys/mutex.h> 62#include <sys/mutex.h>
63#include <sys/kernel.h> 63#include <sys/kernel.h>
64#include <sys/socket.h> 64#include <sys/socket.h>
65#include <sys/device.h> 65#include <sys/device.h>
66#include <sys/queue.h> 66#include <sys/queue.h>
67#include <sys/callout.h> 67#include <sys/callout.h>
68#include <sys/sysctl.h> 68#include <sys/sysctl.h>
@@ -1679,26 +1679,28 @@ mskc_attach(device_t parent, device_t se @@ -1679,26 +1679,28 @@ mskc_attach(device_t parent, device_t se
1679 revstr = "A0"; 1679 revstr = "A0";
1680 break; 1680 break;
1681 default: 1681 default:
1682 ; 1682 ;
1683 } 1683 }
1684 } 1684 }
1685 1685
1686 /* Announce the product name. */ 1686 /* Announce the product name. */
1687 aprint_normal(", %s", sc->sk_name); 1687 aprint_normal(", %s", sc->sk_name);
1688 if (revstr != NULL) 1688 if (revstr != NULL)
1689 aprint_normal(" rev. %s", revstr); 1689 aprint_normal(" rev. %s", revstr);
1690 aprint_normal(" (0x%x): %s\n", sc->sk_rev, intrstr); 1690 aprint_normal(" (0x%x): %s\n", sc->sk_rev, intrstr);
1691 1691
 1692 aprint_normal_dev(sc->sk_dev, "interrupting at %s\n", intrstr);
 1693
1692 sc->sk_macs = 1; 1694 sc->sk_macs = 1;
1693 1695
1694 hw = sk_win_read_1(sc, SK_Y2_HWRES); 1696 hw = sk_win_read_1(sc, SK_Y2_HWRES);
1695 if ((hw & SK_Y2_HWRES_LINK_MASK) == SK_Y2_HWRES_LINK_DUAL) { 1697 if ((hw & SK_Y2_HWRES_LINK_MASK) == SK_Y2_HWRES_LINK_DUAL) {
1696 if ((sk_win_read_1(sc, SK_Y2_CLKGATE) & 1698 if ((sk_win_read_1(sc, SK_Y2_CLKGATE) &
1697 SK_Y2_CLKGATE_LINK2_INACTIVE) == 0) 1699 SK_Y2_CLKGATE_LINK2_INACTIVE) == 0)
1698 sc->sk_macs++; 1700 sc->sk_macs++;
1699 } 1701 }
1700 1702
1701 skca.skc_port = SK_PORT_A; 1703 skca.skc_port = SK_PORT_A;
1702 skca.skc_type = sc->sk_type; 1704 skca.skc_type = sc->sk_type;
1703 skca.skc_rev = sc->sk_rev; 1705 skca.skc_rev = sc->sk_rev;
1704 (void)config_found(sc->sk_dev, &skca, mskcprint); 1706 (void)config_found(sc->sk_dev, &skca, mskcprint);