From nobody Fri May 17 16:18:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgsZl1Wnlz5LPXM for ; Fri, 17 May 2024 16:18:23 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgsZk6NXyz4S3F for ; Fri, 17 May 2024 16:18:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-420180b58c5so2412295e9.3 for ; Fri, 17 May 2024 09:18:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715962701; x=1716567501; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PYJ+H0VPNzmFVKkm7Hz1w5TqiXFv73T02ZcTGj8D/yI=; b=n9J1Mr7tzyrO3gxB8yH0VkDt/3mWhF2TaCwNvAuL6bMGCeKglf+/VHWk063789Tm71 ZmgBHwW1z6EuYOrC7ghqXUrf5dy/dcaUfeaEQ0ma8Rm4vg4+vy4QmhemwE2+Xg1CrNA5 mrDsjkJP0nX7xVWCuM9wjLKhbgMqvT5dDaSlH2uNE7N3Xb77h3oazkm0J3tky6USlk8M +HC/NEOTKT3VC3fRxtC9mCxItTeqkOSQm+35hrcn6GorbrmPVc/iKWtH2GraEPF5EleX +mVtAOxW9SmYXT3tRGQ6zcWF/pfjmGj9mt0aTOHmW5J3ZacyoV1fNCU0GigepqgEsKX8 86WQ== X-Forwarded-Encrypted: i=1; AJvYcCUGecxmHN0jK2GvOabUgkg2Pjk0IaaJ2WRNLmYwyZWMiYM690CmpmEqvxxNLOwcWzrbjipHGb62eK8mMXq76XLFklJgcVElccErAOqbIO0m X-Gm-Message-State: AOJu0YwrCCceKA5E0NFNOg7BhAWcp33rrLM8c023chWAEzwiikoP5iKO +2jgVUUpGofTedvDJ8yH35rQ2f8Y/nYRFC79ETWPqCV68m2VIUYon/Z2vsPDBEs= X-Google-Smtp-Source: AGHT+IEeCoMqQ4MJPxQMftelaExo9hCQd9ycamhuMKudv3OITdiC+FLamJpadli5jwmtVlz1jg7H8w== X-Received: by 2002:a05:600c:4f92:b0:420:177f:c2a6 with SMTP id 5b1f17b1804b1-420177fc636mr116454325e9.10.1715962700614; Fri, 17 May 2024 09:18:20 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-420113d808bsm223867615e9.12.2024.05.17.09.18.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:18:20 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Subject: Re: git: 097bd33dd7a6 - main - uart: DBG2 support to find the debug uart From: Jessica Clarke In-Reply-To: <202405171612.44HGCneJ065061@gitrepo.freebsd.org> Date: Fri, 17 May 2024 17:18:09 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6E417087-31C3-4B5F-938A-88753F4F9043@freebsd.org> References: <202405171612.44HGCneJ065061@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3774.500.171.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VgsZk6NXyz4S3F On 17 May 2024, at 17:12, Andrew Turner wrote: >=20 > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D097bd33dd7a687cd3ad7fd4bc7ededa3= b9e00e28 >=20 > commit 097bd33dd7a687cd3ad7fd4bc7ededa3b9e00e28 > Author: Andrew Turner > AuthorDate: 2024-03-12 18:15:29 +0000 > Commit: Andrew Turner > CommitDate: 2024-05-17 16:07:15 +0000 >=20 > uart: DBG2 support to find the debug uart >=20 > The Debug Port Table 2 (DBG2) contains information on which devices > can be used for debugging purposes. >=20 > Add support to the uart driver to use the DBG2 table when enabled = from > loader. >=20 > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D44359 > --- > sys/dev/uart/uart_cpu_acpi.c | 83 = ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 83 insertions(+) >=20 > diff --git a/sys/dev/uart/uart_cpu_acpi.c = b/sys/dev/uart/uart_cpu_acpi.c > index 9c9ffc1e3194..53fe459e64a1 100644 > --- a/sys/dev/uart/uart_cpu_acpi.c > +++ b/sys/dev/uart/uart_cpu_acpi.c > @@ -210,12 +210,95 @@ out: > return (error); > } >=20 > +static int > +uart_cpu_acpi_dbg2(struct uart_devinfo *di) > +{ > + vm_paddr_t dbg2_physaddr; > + ACPI_TABLE_DBG2 *dbg2; > + ACPI_DBG2_DEVICE *dbg2_dev; > + ACPI_GENERIC_ADDRESS *base_address; > + struct acpi_uart_compat_data *cd; > + struct uart_class *class; > + int error; > + bool found; > + > + /* Look for the SPCR table. */ > + dbg2_physaddr =3D acpi_find_table(ACPI_SIG_DBG2); > + if (dbg2_physaddr =3D=3D 0) > + return (ENXIO); > + > + dbg2 =3D acpi_map_table(dbg2_physaddr, ACPI_SIG_DBG2); > + if (dbg2 =3D=3D NULL) { > + printf("Unable to map the DBG2 table!\n"); > + return (ENXIO); > + } > + > + error =3D ENXIO; > + > + dbg2_dev =3D (ACPI_DBG2_DEVICE *)((vm_offset_t)dbg2 + = dbg2->InfoOffset); > + found =3D false; > + while ((vm_offset_t)dbg2_dev + dbg2_dev->Length <=3D Can this please use uintptr_t or char * for pointer arithmetic rather than the not-a-pointer vm_offset_t throughout? Jess > + (vm_offset_t)dbg2 + dbg2->Header.Length) { > + if (dbg2_dev->PortType !=3D ACPI_DBG2_SERIAL_PORT) > + goto next; > + > + /* XXX: Too restrictive? */ > + if (dbg2_dev->RegisterCount !=3D 1) > + goto next; > + > + cd =3D uart_cpu_acpi_scan(dbg2_dev->PortSubtype); > + if (cd =3D=3D NULL) > + goto next; > + > + class =3D cd->cd_class; > + base_address =3D (ACPI_GENERIC_ADDRESS *) > + ((vm_offset_t)dbg2_dev + dbg2_dev->BaseAddressOffset); > + > + error =3D uart_cpu_acpi_init_devinfo(di, class, base_address); > + if (error =3D=3D 0) { > + found =3D true; > + break; > + } > + > +next: > + dbg2_dev =3D (ACPI_DBG2_DEVICE *) > + ((vm_offset_t)dbg2_dev + dbg2_dev->Length); > + } > + if (!found) > + goto out; > + > + /* XXX: Find the correct value */ > + di->baudrate =3D 115200; > + > + /* Apply device tweaks. */ > + if ((cd->cd_quirks & UART_F_IGNORE_SPCR_REGSHFT) =3D=3D > + UART_F_IGNORE_SPCR_REGSHFT) { > + di->bas.regshft =3D cd->cd_regshft; > + } > + > + /* Create a bus space handle. */ > + error =3D bus_space_map(di->bas.bst, base_address->Address, > + uart_getrange(class), 0, &di->bas.bsh); > + > +out: > + acpi_unmap_table(dbg2); > + return (error); > +} > + > int > uart_cpu_acpi_setup(int devtype, struct uart_devinfo *di) > { > + char *cp; > + > switch(devtype) { > case UART_DEV_CONSOLE: > return (uart_cpu_acpi_spcr(devtype, di)); > + case UART_DEV_DBGPORT: > + /* Use the Debug Port Table 2 (DBG2) to find a debug uart */ > + cp =3D kern_getenv("hw.acpi.enable_dbg2"); > + if (cp !=3D NULL && strcasecmp(cp, "yes") =3D=3D 0) > + return (uart_cpu_acpi_dbg2(di)); > + break; > } > return (ENXIO); > }