CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src Committed By: martin Date: Sun Feb 18 16:25:25 UTC 2024 Modified Files: src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c Log Message: Pull up following revision(s) (requested by skrll in ticket #599): sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.44 Test sc->sc_soft_ih (not sc->sc_ih) to see if the soft interrupt got established correctly. From Mori Hiroki. Fix some error recovery while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/arch/arm/broadcom/bcm53xx_eth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src
Committed By: martin
Date: Sun Feb 18 16:25:25 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_eth.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #599):
sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.44
Test sc->sc_soft_ih (not sc->sc_ih) to see if the soft interrupt got
established correctly.
From Mori Hiroki.
Fix some error recovery while I'm here.
To generate a diff of this commit:
cvs rdiff -u -r1.42.4.1 -r1.42.4.2 src/sys/arch/arm/broadcom/bcm53xx_eth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_eth.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.1 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.2
--- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.42.4.1 Sun Feb 18 16:19:57 2024
+++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Sun Feb 18 16:25:25 2024
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42.4.1 2024/02/18 16:19:57 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_eth.c,v 1.42.4.2 2024/02/18 16:25:25 martin Exp $");
#include
#include
@@ -344,16 +344,15 @@ bcmeth_ccb_attach(device_t parent, devic
(PRI_USER + MAXPRI_USER) / 2, IPL_NET, WQ_MPSAFE|WQ_PERCPU);
if (error) {
aprint_error(": failed to create workqueue: %d\n", error);
- goto fail_2;
+ goto fail_1;
}
sc->sc_soft_ih = softint_establish(SOFTINT_MPSAFE | SOFTINT_NET,
bcmeth_soft_intr, sc);
- if (sc->sc_ih == NULL) {
- aprint_error_dev(self, "failed to establish interrupt %d\n",
- loc->loc_intrs[0]);
- goto fail_3;
+ if (sc->sc_soft_ih == NULL) {
+ aprint_error_dev(self, "failed to establish soft interrupt\n");
+ goto fail_2;
}
sc->sc_ih = intr_establish(loc->loc_intrs[0], IPL_VM, IST_LEVEL,
@@ -362,7 +361,7 @@ bcmeth_ccb_attach(device_t parent, devic
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
loc->loc_intrs[0]);
- goto fail_4;
+ goto fail_3;
} else {
aprint_normal_dev(self, "interrupting on irq %d\n",
loc->loc_intrs[0]);
@@ -426,8 +425,6 @@ bcmeth_ccb_attach(device_t parent, devic
return;
-fail_4:
- intr_disestablish(sc->sc_ih);
fail_3:
softint_disestablish(sc->sc_soft_ih);
fail_2:
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src
Committed By: skrll
Date: Fri Feb 16 12:08:02 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom [netbsd-10]: bcm2835_bsc.c bcm2835_vcaudio.c
bcm2838_pcie.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.22.1 src/sys/arch/arm/broadcom/bcm2835_bsc.c
cvs rdiff -u -r1.18 -r1.18.16.1 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/broadcom/bcm2838_pcie.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_bsc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc.c:1.15 src/sys/arch/arm/broadcom/bcm2835_bsc.c:1.15.22.1
--- src/sys/arch/arm/broadcom/bcm2835_bsc.c:1.15 Tue Mar 31 12:23:17 2020
+++ src/sys/arch/arm/broadcom/bcm2835_bsc.c Fri Feb 16 12:08:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc.c,v 1.15 2020/03/31 12:23:17 jmcneill Exp $ */
+/* $NetBSD: bcm2835_bsc.c,v 1.15.22.1 2024/02/16 12:08:02 skrll Exp $ */
/*
* Copyright (c) 2019 Jason R. Thorpe
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc.c,v 1.15 2020/03/31 12:23:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc.c,v 1.15.22.1 2024/02/16 12:08:02 skrll Exp $");
#include
#include
@@ -203,7 +203,7 @@ bsciic_next_state(struct bsciic_softc *
case BSC_EXEC_STATE_SEND_DATA:
case BSC_EXEC_STATE_RECV_DATA:
return BSC_EXEC_STATE_DONE;
-
+
case BSC_EXEC_STATE_DONE:
case BSC_EXEC_STATE_ERROR:
return sc->sc_exec_state;
Index: src/sys/arch/arm/broadcom/bcm2835_vcaudio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.18 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.18.16.1
--- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.18 Sat Apr 24 23:36:26 2021
+++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c Fri Feb 16 12:08:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.18 2021/04/24 23:36:26 thorpej Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.18.16.1 2024/02/16 12:08:02 skrll Exp $ */
/*-
* Copyright (c) 2013 Jared D. McNeill
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.18 2021/04/24 23:36:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.18.16.1 2024/02/16 12:08:02 skrll Exp $");
#include
#include
@@ -88,7 +88,7 @@ enum vcaudio_dest {
*
* Setting blocksize to 4 x 1600 means that we send approx 33ms of audio. We
* prefill by two blocks before starting audio meaning we have 50ms of latency.
- *
+ *
* Six messages of 1600 bytes was chosen working back from a desired latency of
* 50ms.
*/
Index: src/sys/arch/arm/broadcom/bcm2838_pcie.c
diff -u src/sys/arch/arm/broadcom/bcm2838_pcie.c:1.6 src/sys/arch/arm/broadcom/bcm2838_pcie.c:1.6.2.1
--- src/sys/arch/arm/broadcom/bcm2838_pcie.c:1.6 Sat Oct 15 11:07:38 2022
+++ src/sys/arch/arm/broadcom/bcm2838_pcie.c Fri Feb 16 12:08:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2838_pcie.c,v 1.6 2022/10/15 11:07:38 jmcneill Exp $ */
+/* $NetBSD: bcm2838_pcie.c,v 1.6.2.1 2024/02/16 12:08:02 skrll Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2838_pcie.c,v 1.6 2022/10/15 11:07:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2838_pcie.c,v 1.6.2.1 2024/02/16 12:08:02 skrll Exp $");
#include
#include
@@ -417,7 +417,7 @@ bcmstb_setwin(struct bcmstb_softc *sc, i
STBRMW(sc, PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI(win),
PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE,
__SHIFTIN(base, PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE));
-
+
STBRMW(sc, PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI(win),
PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT,
__SHIFTIN(base, PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT));
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src Committed By: skrll Date: Fri Feb 16 12:08:02 UTC 2024 Modified Files: src/sys/arch/arm/broadcom [netbsd-10]: bcm2835_bsc.c bcm2835_vcaudio.c bcm2838_pcie.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.22.1 src/sys/arch/arm/broadcom/bcm2835_bsc.c cvs rdiff -u -r1.18 -r1.18.16.1 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/broadcom/bcm2838_pcie.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src
Committed By: skrll
Date: Fri Feb 16 12:07:08 UTC 2024
Modified Files:
src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_board.c bcm53xx_cca.c
bcm53xx_idm.c bcm53xx_pax.c bcm53xx_reg.h
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.30.1 src/sys/arch/arm/broadcom/bcm53xx_board.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/arm/broadcom/bcm53xx_cca.c
cvs rdiff -u -r1.3 -r1.3.70.1 src/sys/arch/arm/broadcom/bcm53xx_idm.c
cvs rdiff -u -r1.22 -r1.22.6.1 src/sys/arch/arm/broadcom/bcm53xx_pax.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/arm/broadcom/bcm53xx_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_board.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_board.c:1.25 src/sys/arch/arm/broadcom/bcm53xx_board.c:1.25.30.1
--- src/sys/arch/arm/broadcom/bcm53xx_board.c:1.25 Tue Jul 31 06:46:25 2018
+++ src/sys/arch/arm/broadcom/bcm53xx_board.c Fri Feb 16 12:07:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_board.c,v 1.25 2018/07/31 06:46:25 skrll Exp $ */
+/* $NetBSD: bcm53xx_board.c,v 1.25.30.1 2024/02/16 12:07:07 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.25 2018/07/31 06:46:25 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.25.30.1 2024/02/16 12:07:07 skrll Exp $");
#include
#include
@@ -328,7 +328,7 @@ bcm53xx_usb_clock_init(struct bcm53xx_cl
const uint32_t ndiv = bcm53xx_value_wrap(usb2_control,
USB2_CONTROL_NDIV_INT);
- uint32_t usb_ref = (clk->clk_usb2 / pdiv) * ndiv;
+ uint32_t usb_ref = (clk->clk_usb2 / pdiv) * ndiv;
if (usb_ref != USB2_REF_CLK) {
/*
* USB Reference Clock isn't 1.92GHz. So we need to modify
@@ -350,7 +350,7 @@ bcm53xx_usb_clock_init(struct bcm53xx_cl
bus_space_write_4(bcm53xx_ioreg_bst, bcm53xx_ioreg_bsh,
CRU_BASE + CRU_CLKSET_KEY, 0);
- usb_ref = (clk->clk_usb2 / pdiv) * new_ndiv;
+ usb_ref = (clk->clk_usb2 / pdiv) * new_ndiv;
}
clk->clk_usb_ref = usb_ref;
@@ -367,7 +367,7 @@ bcm53xx_clock_init(struct bcm53xx_clock_
/*
* F(ddr) = ((1 / pdiv) * ndiv * CH2) / (post_div * 2)
*/
-static void
+static void
bcm53xx_get_ddr_freq(struct bcm53xx_clock_info *clk, uint32_t pll_status,
uint32_t pll_dividers)
{
@@ -402,7 +402,7 @@ bcm53xx_get_cpu_freq(struct bcm53xx_cloc
clk->clk_apb = clk->clk_cpu / 4;
return;
}
-
+
const u_int pdiv = bcm53xx_value_wrap(pllarma, CLK_PLLARMA_PDIV);
const u_int ndiv_int = bcm53xx_value_wrap(pllarma, CLK_PLLARMA_NDIV_INT);
const u_int ndiv_frac = __SHIFTOUT(pllarmb, CLK_PLLARMB_NDIV_FRAC);
@@ -605,13 +605,13 @@ bcm53xx_device_register(device_t self, v
* XXX KLUDGE ALERT XXX
* The iot mainbus supplies is completely wrong since it scales
* addresses by 2. The simplest remedy is to replace with our
- * bus space used for the armcore registers (which armperiph uses).
+ * bus space used for the armcore registers (which armperiph uses).
*/
struct mainbus_attach_args * const mb = aux;
mb->mb_iot = bcm53xx_armcore_bst;
return;
}
-
+
/*
* We need to tell the A9 Global/Watchdog Timer
* what frequency it runs at.
@@ -649,8 +649,8 @@ bcm53xx_srab_init(void)
{
mutex_init(_lock, MUTEX_DEFAULT, IPL_VM);
- bcm53xx_srab_write_4(0x0079, 0x90); // reset switch
- for (u_int port = 0; port < 8; port++) {
+ bcm53xx_srab_write_4(0x0079, 0x90); // reset switch
+ for (u_int port = 0; port < 8; port++) {
/* per port control: no stp */
bcm53xx_srab_write_4(port, 0x00);
}
Index: src/sys/arch/arm/broadcom/bcm53xx_cca.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.5 src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.5.4.1
--- src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.5 Thu Mar 3 06:26:28 2022
+++ src/sys/arch/arm/broadcom/bcm53xx_cca.c Fri Feb 16 12:07:07 2024
@@ -43,7 +43,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_cca.c,v 1.5 2022/03/03 06:26:28 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_cca.c,v 1.5.4.1 2024/02/16 12:07:07 skrll Exp $");
#include
#include
@@ -143,7 +143,7 @@ bcmcca_intr(void *arg)
}
}
if (v & INTSTATUS_GPIOINT) {
-
+
}
return rv;
}
Index: src/sys/arch/arm/broadcom/bcm53xx_idm.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_idm.c:1.3 src/sys/arch/arm/broadcom/bcm53xx_idm.c:1.3.70.1
--- src/sys/arch/arm/broadcom/bcm53xx_idm.c:1.3 Wed Dec 12 00:01:28 2012
+++ src/sys/arch/arm/broadcom/bcm53xx_idm.c Fri Feb 16 12:07:08 2024
@@ -35,7 +35,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_idm.c,v 1.3 2012/12/12 00:01:28 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_idm.c,v 1.3.70.1 2024/02/16 12:07:08 skrll Exp $");
#include
#include
@@ -59,7 +59,7 @@ struct idm_info {
static bool
bcmeth_unreset(bus_space_tag_t bst,
CVS commit: [netbsd-10] src/sys/arch/arm/broadcom
Module Name:src Committed By: skrll Date: Fri Feb 16 12:07:08 UTC 2024 Modified Files: src/sys/arch/arm/broadcom [netbsd-10]: bcm53xx_board.c bcm53xx_cca.c bcm53xx_idm.c bcm53xx_pax.c bcm53xx_reg.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.30.1 src/sys/arch/arm/broadcom/bcm53xx_board.c cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/arm/broadcom/bcm53xx_cca.c cvs rdiff -u -r1.3 -r1.3.70.1 src/sys/arch/arm/broadcom/bcm53xx_idm.c cvs rdiff -u -r1.22 -r1.22.6.1 src/sys/arch/arm/broadcom/bcm53xx_pax.c cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/arm/broadcom/bcm53xx_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
