CVS commit: src/sys/arch/arm/omap

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Fri Oct  7 22:30:48 UTC 2022

Modified Files:
src/sys/arch/arm/omap: omapl1x_timer.c

Log Message:
fix typos in chained/unchained mode definitions (s/CHANINED/CHAINED).
fix typo in comment s/32 bot/32-bit/.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omapl1x_timer.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/omap/omapl1x_timer.c
diff -u src/sys/arch/arm/omap/omapl1x_timer.c:1.4 src/sys/arch/arm/omap/omapl1x_timer.c:1.5
--- src/sys/arch/arm/omap/omapl1x_timer.c:1.4	Sat Feb 12 17:09:43 2022
+++ src/sys/arch/arm/omap/omapl1x_timer.c	Fri Oct  7 22:30:48 2022
@@ -25,7 +25,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_timer.c,v 1.4 2022/02/12 17:09:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_timer.c,v 1.5 2022/10/07 22:30:48 andvar Exp $");
 
 #include "opt_timer.h"
 
@@ -117,9 +117,9 @@ static struct omapl1xtmr_softc *ref_sc;
 
 /* Timer modes */
 #define TGCR_TIMMODE_64BIT		0x0
-#define TGCR_TIMMODE_32BIT_UNCHANINED	0x1
+#define TGCR_TIMMODE_32BIT_UNCHAINED	0x1
 #define TGCR_TIMMODE_64BIT_WDOG		0x2
-#define TGCR_TIMMODE_32BIT_CHANINED	0x3
+#define TGCR_TIMMODE_32BIT_CHAINED	0x3
 #define TGCR_TIMMODE_SHIFT		2
 
 #define TGCR_RS_STOP		0x0
@@ -277,8 +277,8 @@ timer_init (struct omapl1xtmr_softc *sc,
 	if (intr)
 		omapl1xtimer_prd_intr_enb(sc);
 
-	/* Set timers to 32 bot unchained mode */
-	val = TGCR_TIMMODE_32BIT_UNCHANINED << TGCR_TIMMODE_SHIFT;
+	/* Set timers to 32-bit unchained mode */
+	val = TGCR_TIMMODE_32BIT_UNCHAINED << TGCR_TIMMODE_SHIFT;
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, TGCR, val);
 
 	omapl1xtimer_start(sc);

CVS commit: src/sys/arch/arm/omap

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Fri Oct  7 22:30:48 UTC 2022

Modified Files:
src/sys/arch/arm/omap: omapl1x_timer.c

Log Message:
fix typos in chained/unchained mode definitions (s/CHANINED/CHAINED).
fix typo in comment s/32 bot/32-bit/.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omapl1x_timer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/arm/omap

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Sep 18 15:19:36 UTC 2022

Modified Files:
src/sys/arch/arm/omap: omapl1x_emac.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omapl1x_emac.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/omap/omapl1x_emac.c
diff -u src/sys/arch/arm/omap/omapl1x_emac.c:1.11 src/sys/arch/arm/omap/omapl1x_emac.c:1.12
--- src/sys/arch/arm/omap/omapl1x_emac.c:1.11	Thu May 30 02:32:17 2019
+++ src/sys/arch/arm/omap/omapl1x_emac.c	Sun Sep 18 15:19:36 2022
@@ -30,7 +30,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_emac.c,v 1.11 2019/05/30 02:32:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_emac.c,v 1.12 2022/09/18 15:19:36 thorpej Exp $");
 
 #include "opt_omapl1x.h"
 
@@ -713,13 +713,9 @@ emac_desc_dequeue (struct emac_softc *sc
 {
 	int ret;
 	struct emac_chain *entry;
-	struct ifnet * const ifp = >sc_if;
 
 	if (chan->ch == TXCH) {
 		ret = emac_tx_desc_dequeue(sc, chan);
-		if (ret == 0) {
-			ifp->if_flags &= ~IFF_OACTIVE;
-		}
 	} else {
 		/* Process the received packet */
 		ret = emac_rx_desc_process(sc, chan);
@@ -862,8 +858,7 @@ emac_ifstart (struct ifnet *ifp)
 	bus_dmamap_t map;
 	int error;
 
-	if (__predict_false((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) !=
-			IFF_RUNNING)) {
+	if (__predict_false((ifp->if_flags & IFF_RUNNING) == 0)) {
 		return;
 	}
 
@@ -943,9 +938,6 @@ remap:
 			goto unlock;
 	}
 
-	device_printf(sc->sc_dev, "TX desc's full, setting IFF_OACTIVE\n");
-	ifp->if_flags |= IFF_OACTIVE;
-
 unlock:
 	mutex_exit(chan->lock);
 }
@@ -1020,7 +1012,7 @@ emac_ifstop (struct ifnet *ifp, int disa
 
 	mutex_exit(rx_chan->lock);
 
-	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+	ifp->if_flags &= ~IFF_RUNNING;
 }
 
 static int
@@ -1093,7 +1085,6 @@ emac_ifinit (struct ifnet *ifp)
 	rx_chan->run = true;
 	callout_schedule(>sc_mii_callout, hz);
 	ifp->if_flags |= IFF_RUNNING;
-	ifp->if_flags &= ~IFF_OACTIVE;
 
 	mutex_enter(sc->sc_hwlock);
 	emac_int_enable(sc);

CVS commit: src/sys/arch/arm/omap

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Sep 18 15:19:36 UTC 2022

Modified Files:
src/sys/arch/arm/omap: omapl1x_emac.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omapl1x_emac.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/arm/omap

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Sep 18 15:14:06 UTC 2022

Modified Files:
src/sys/arch/arm/omap: if_cpsw.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/omap/if_cpsw.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/omap/if_cpsw.c
diff -u src/sys/arch/arm/omap/if_cpsw.c:1.28 src/sys/arch/arm/omap/if_cpsw.c:1.29
--- src/sys/arch/arm/omap/if_cpsw.c:1.28	Tue Feb  4 07:35:34 2020
+++ src/sys/arch/arm/omap/if_cpsw.c	Sun Sep 18 15:14:06 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cpsw.c,v 1.28 2020/02/04 07:35:34 skrll Exp $	*/
+/*	$NetBSD: if_cpsw.c,v 1.29 2022/09/18 15:14:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.28 2020/02/04 07:35:34 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.29 2022/09/18 15:14:06 thorpej Exp $");
 
 #include 
 #include 
@@ -129,6 +129,7 @@ struct cpsw_softc {
 	volatile u_int sc_txnext;
 	volatile u_int sc_txhead;
 	volatile u_int sc_rxhead;
+	bool sc_txbusy;
 	void *sc_rxthih;
 	void *sc_rxih;
 	void *sc_txih;
@@ -596,8 +597,10 @@ cpsw_start(struct ifnet *ifp)
 	KERNHIST_FUNC(__func__);
 	KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, 0, 0, 0);
 
-	if (__predict_false((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) !=
-	IFF_RUNNING)) {
+	if (__predict_false((ifp->if_flags & IFF_RUNNING) == 0)) {
+		return;
+	}
+	if (__predict_false(sc->sc_txbusy)) {
 		return;
 	}
 
@@ -629,7 +632,7 @@ cpsw_start(struct ifnet *ifp)
 		}
 
 		if (dm->dm_nsegs + 1 >= txfree) {
-			ifp->if_flags |= IFF_OACTIVE;
+			sc->sc_txbusy = true;
 			bus_dmamap_unload(sc->sc_bdt, dm);
 			break;
 		}
@@ -1007,7 +1010,7 @@ cpsw_init(struct ifnet *ifp)
 	sc->sc_txeoq = true;
 	callout_schedule(>sc_tick_ch, hz);
 	ifp->if_flags |= IFF_RUNNING;
-	ifp->if_flags &= ~IFF_OACTIVE;
+	sc->sc_txbusy = false;
 
 	return 0;
 }
@@ -1075,8 +1078,9 @@ cpsw_stop(struct ifnet *ifp, int disable
 		rdp->tx_mb[i] = NULL;
 	}
 
-	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+	ifp->if_flags &= ~IFF_RUNNING;
 	ifp->if_timer = 0;
+	sc->sc_txbusy = false;
 
 	if (!disable)
 		return;
@@ -1270,7 +1274,7 @@ cpsw_txintr(void *arg)
 
 		handled = true;
 
-		ifp->if_flags &= ~IFF_OACTIVE;
+		sc->sc_txbusy = false;
 
 next:
 		if (ISSET(dw[3], CPDMA_BD_EOP) && ISSET(dw[3], CPDMA_BD_EOQ)) {

CVS commit: src/sys/arch/arm/omap

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Sep 18 15:14:06 UTC 2022

Modified Files:
src/sys/arch/arm/omap: if_cpsw.c

Log Message:
Eliminate use of IFF_OACTIVE.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/omap/if_cpsw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: src/sys/arch/arm/omap

[Joerg Sonnenberger]

On Sat, Oct 15, 2016 at 03:11:56PM +, KIYOHARA Takashi wrote:
> Module Name:  src
> Committed By: kiyohara
> Date: Sat Oct 15 15:11:56 UTC 2016
> 
> Modified Files:
>   src/sys/arch/arm/omap: files.omap2 omap2_gpio.c
> 
> Log Message:
> Support TI_AM335X gpio to omap2_gpio.c.

From
https://releng.netbsd.org/builds/HEAD-llvm/201610161110Z/evbarm-earm.build.failed

/home/source/ab/HEAD-llvm/src/sys/arch/arm/omap/omap2_gpio.c:67:33:
error: unused variable 'gpio_module' [-Werror,-Wunused-const-variable]

Joerg

Re: CVS commit: src/sys/arch/arm/omap

[coypu]

Hi,

On Sat, Oct 15, 2016 at 03:09:00PM +, KIYOHARA Takashi wrote:
> + fifo = OMAP2_I2C_FIFOBYTES(fifodepth);

>From 
>http://releng.netbsd.org/builds/HEAD/201610160020Z/evbarm-earmv7hf.build.failed


--- kern-BEAGLEBONE ---
/home/source/ab/HEAD/src/sys/arch/arm/omap/ti_iic.c: In function 
'ti_iic_attach':
/home/source/ab/HEAD/src/sys/arch/arm/omap/ti_iic.c:281:9: error: implicit 
declaration of function 'OMAP2_I2C_FIFOBYTES' 
[-Werror=implicit-function-declaration]
  fifo = OMAP2_I2C_FIFOBYTES(fifodepth);
 ^

Re: CVS commit: src/sys/arch/arm/omap

[KIYOHARA Takashi]

Hi!


From: "Jonathan A. Kollasch" 
Date: Thu, 4 Aug 2016 22:02:54 -0500

> On Fri, Aug 05, 2016 at 11:27:13AM +0900, KIYOHARA Takashi wrote:
>> Hi!
>> 
>> 
>> From: "Jonathan A. Kollasch" 
>> Date: Thu, 4 Aug 2016 20:07:18 +
>> 
>> > Module Name:   src
>> > Committed By:  jakllsch
>> > Date:  Thu Aug  4 20:07:18 UTC 2016
>> > 
>> > Modified Files:
>> >src/sys/arch/arm/omap: omap3_sdhc.c
>> > 
>> > Log Message:
>> > TI_DM37xx does not currently have a working omapscm(4), which provides
>> > omap_devid().  Avoid using omap_devid() until correctly fixed.
>> 
>> Why not attach omapscm?
>> My Overo EarthSTORM(AM3703) is working with omapscm.  The OVERO supports
>> OMAP 3503, 3530, DM3730 and AM3703.


> BEAGLEBOARDXM w/
> omapscm0at obio0 addr 0x48002000 size 0x1000 :
> 
> src/sys/arch/arm/omap/omap3_scm.c: In function 'omap3_scm_match':
> src/sys/arch/arm/omap/omap3_scm.c:138:25:
> error: 'SCM_BASE' undeclared (first use in this function)
>   if (obio->obio_addr == SCM_BASE)
> 

Please try after 'cvs update'.

Thanks,
--
kiyohara

Re: CVS commit: src/sys/arch/arm/omap

[Jonathan A. Kollasch]

On Fri, Aug 05, 2016 at 11:27:13AM +0900, KIYOHARA Takashi wrote:
> Hi!
> 
> 
> From: "Jonathan A. Kollasch" 
> Date: Thu, 4 Aug 2016 20:07:18 +
> 
> > Module Name:src
> > Committed By:   jakllsch
> > Date:   Thu Aug  4 20:07:18 UTC 2016
> > 
> > Modified Files:
> > src/sys/arch/arm/omap: omap3_sdhc.c
> > 
> > Log Message:
> > TI_DM37xx does not currently have a working omapscm(4), which provides
> > omap_devid().  Avoid using omap_devid() until correctly fixed.
> 
> Why not attach omapscm?
> My Overo EarthSTORM(AM3703) is working with omapscm.  The OVERO supports
> OMAP 3503, 3530, DM3730 and AM3703.
> 
> Thanks,
> --
> kiyohara

BEAGLEBOARDXM w/o omapscm0:
src/sys/arch/arm/omap/omap3_sdhc.c:236: undefined reference to `omap_devid'

BEAGLEBOARDXM w/
omapscm0at obio0 addr 0x48002000 size 0x1000 :

src/sys/arch/arm/omap/omap3_scm.c: In function 'omap3_scm_match':
src/sys/arch/arm/omap/omap3_scm.c:138:25:
error: 'SCM_BASE' undeclared (first use in this function)
  if (obio->obio_addr == SCM_BASE)


Jonathan Kollasch

Re: CVS commit: src/sys/arch/arm/omap

[KIYOHARA Takashi]

Hi!


From: "Jonathan A. Kollasch" 
Date: Thu, 4 Aug 2016 20:07:18 +

> Module Name:  src
> Committed By: jakllsch
> Date: Thu Aug  4 20:07:18 UTC 2016
> 
> Modified Files:
>   src/sys/arch/arm/omap: omap3_sdhc.c
> 
> Log Message:
> TI_DM37xx does not currently have a working omapscm(4), which provides
> omap_devid().  Avoid using omap_devid() until correctly fixed.

Why not attach omapscm?
My Overo EarthSTORM(AM3703) is working with omapscm.  The OVERO supports
OMAP 3503, 3530, DM3730 and AM3703.

Thanks,
--
kiyohara

Re: CVS commit: src/sys/arch/arm/omap

[KIYOHARA Takashi]

Hi! Adam,


From: Adam Hoka ah...@netbsd.org
Date: Sat, 4 Sep 2010 16:23:48 +

 Module Name:  src
 Committed By: ahoka
 Date: Sat Sep  4 16:23:48 UTC 2010
 
 Modified Files:
   src/sys/arch/arm/omap: omap2_gpmc.c omap2_gpmcvar.h
 
 Log Message:
 Add gpmc_register_read and gpmc_register_write to access registers
 mapped by the gpmc driver (eg.: GPMC_CONFIG, GPMC_STATUS).
 
 The driver should save the parent (gpmc) device's sc pointer
 to be able to use these functions.

I think that I should be able to access it with this function doesn't
have softc.
For instance, u-boot of my Overo doesn't set ethernet.  Therefore, I
operate GPMC_CONFIG7_4 in gxio.c for ethernet.

Thanks,
--
kiyohara

Re: CVS commit: src/sys/arch/arm/omap

[Adam Hoka]

On Sun, 05 Sep 2010 15:31:45 +0900 (JST)
KIYOHARA Takashi kiyoh...@kk.iij4u.or.jp wrote:

 Hi! Adam,
 
 
 From: Adam Hoka ah...@netbsd.org
 Date: Sat, 4 Sep 2010 16:23:48 +
 
  Module Name:src
  Committed By:   ahoka
  Date:   Sat Sep  4 16:23:48 UTC 2010
  
  Modified Files:
  src/sys/arch/arm/omap: omap2_gpmc.c omap2_gpmcvar.h
  
  Log Message:
  Add gpmc_register_read and gpmc_register_write to access registers
  mapped by the gpmc driver (eg.: GPMC_CONFIG, GPMC_STATUS).
  
  The driver should save the parent (gpmc) device's sc pointer
  to be able to use these functions.
 
 I think that I should be able to access it with this function doesn't
 have softc.
 For instance, u-boot of my Overo doesn't set ethernet.  Therefore, I
 operate GPMC_CONFIG7_4 in gxio.c for ethernet.

Why not in the ethernet driver?

-- 
NetBSD - Simplicity is prerequisite for reliability

Re: CVS commit: src/sys/arch/arm/omap

[Adam Hoka]

On Tue, 31 Aug 2010 19:03:55 +
Michael Lorenz macal...@netbsd.org wrote:

 Module Name:  src
 Committed By: macallan
 Date: Tue Aug 31 19:03:55 UTC 2010
 
 Added Files:
   src/sys/arch/arm/omap: omapfb.c omapfbreg.h
 
 Log Message:
 a simple console driver for the OMAP 3xxx on-chip video
 no acceleration so far and it will recycle whatever video mode the firmware
 set up

does it work with the s-video out?

-- 
NetBSD - Simplicity is prerequisite for reliability