From nobody Mon Dec 1 22:37:25 2025 Received: from exactco.de (exactco.de [176.9.10.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63A6F304BBD for ; Wed, 26 Nov 2025 16:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=176.9.10.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764175366; cv=none; b=p8sOjA2Gexn+aznn98eqTsqNxhubbgoZ+Bq1CFsID7HSMw4rxCBgem28iz+lZSRmOhcOx36YP61SykXOYAQNBD6MnxqAHS/vxyMICcTbxQ4zvV7OiLE6vVb6JOQkU12MrTzB+m+k2RzVIuYvVfdVqKTYxgiPjR/w5pASIThOEok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764175366; c=relaxed/simple; bh=dfMIomXHhp28ucHKgLgau7l2KtP61lrgDX1YvILXF1s=; h=Date:Message-Id:Cc:To:Subject:From:Mime-Version:Content-Type; b=S0/3aOIKxDe0UWh8bTUXGZzqZ1hp97fBskz6vozqwMljjgXXIt9BGnB8PXo5S+TNjnL7W16+5a5g1479uuJjlJDIW767S4DRQjDCUOTV1gvxMq2oBRJqn+x6s4P/2QEEVhMoYd0NdgxavEtbajLau2rIydWAyF+5Hz7r6UCAemE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=exactco.de; spf=pass smtp.mailfrom=exactco.de; dkim=pass (2048-bit key) header.d=exactco.de header.i=@exactco.de header.b=AfdWgFi3; arc=none smtp.client-ip=176.9.10.151 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=exactco.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=exactco.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=exactco.de header.i=@exactco.de header.b="AfdWgFi3" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=exactco.de; s=x; h=Content-Transfer-Encoding:Content-Type:Mime-Version:From:Subject:To:Cc :Message-Id:Date:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=/Eo+ZTEBAmG3RGzLkO+GpCnqlxuZGAbKFhBcjokDkH4=; b=A fdWgFi3r7zufgmaR8Kx7/1yGHoTtJ/jHpdBDEJPLlLYy6iW6J09d8ScoIsyKnGbjSxW7o0Cc6KYtz bIF94lpgELj6EYf1izqwnZqHHc9Bktaotidvu2rRflO+XwRbGg30d43H4x6ZfxScXVmaMfNifzf9q S46Cf+DW8zvDA+y4NvNwGbkmhrinv9cWRjP0vqi3QGDCzpwzhseRSL/j4r5trwgy6vPN35OyMHTtK 3BxkJBt2QncXmOjk0WgBajBmd8aVg7zuzj+lNiNMe7ocY7GLBeBlb2tlEf9CGlCmUzL425k0jD+mo SlpsgjxsW+bqTe7w8JbNeqHycdEYELD6g==; Date: Wed, 26 Nov 2025 17:42:56 +0100 (CET) Message-Id: <20251126.174256.633005540160473731.rene@exactco.de> Cc: Dominik Brodowski To: linux-kernel@vger.kernel.org Subject: [PATCH] PCMCIA: Fix garbled log messages for KERN_CONT From: =?iso-8859-1?Q?Ren=E9?= Rebe X-Mailer: Mew version 6.10 on Emacs 30.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable For years the PCMCIA info messages are messed up by superfluous newlines. While f2e6cf76751d ("pcmcia: Convert dev_printk to dev_") converted the code to pr_cont(), dev_info enforces a \n via vprintk_store setting LOG_NEWLINE, breaking subsequent pr_cont. Fix by logging the device name manually to allow pr_cont to work for more readable and not \n distorted logs. Fixes: f2e6cf76751d ("pcmcia: Convert dev_printk to dev_") Signed-off-by: Ren=C3=A9 Rebe --- Tested on embedded board w/ a Ricoh PCMCIA PCI bridge running T2/Linux. prev: [ 5401.456057] yenta_cardbus 0000:02:06.0: CardBus bridge found [0000:0000] [ 5401.583275] yenta_cardbus 0000:02:06.0: ISA IRQ mask 0x0000, PCI irq 5 [ 5401.583323] yenta_cardbus 0000:02:06.0: Socket status: 30000006 [ 5401.583376] yenta_cardbus 0000:02:06.0: pcmcia: parent PCI bridge window= : [io 0xd000-0xdfff] [ 5401.583411] pcmcia_socket pcmcia_socket0: cs: IO port probe 0xd000-0xdff= f: [ 5401.587663] excluding 0xd000-0xd0ff 0xd400-0xd4ff 0xd800-0xd8ff [ 5401.594124] yenta_cardbus 0000:02:06.0: pcmcia: parent PCI bridge window= : [mem 0xec100000-0xec1fffff] [ 5401.594160] pcmcia_socket pcmcia_socket0: cs: memory probe 0xec100000-0x= ec1fffff: [ 5401.594362] excluding 0xec100000-0xec10ffff [ 5401.594860] yenta_cardbus 0000:02:06.0: pcmcia: parent PCI bridge window= : [mem 0x40000000-0x47ffffff pref] [ 5401.594888] pcmcia_socket pcmcia_socket0: cs: memory probe 0x40000000-0x= 47ffffff: [ 5401.595030] excluding 0x40000000-0x47ffffff [ 5401.661589] pcmcia_socket pcmcia_socket0: cs: IO port probe 0x100-0x3af: [ 5401.661678] excluding nothing: probe failed. [ 5401.662038] pcmcia_socket pcmcia_socket0: cs: IO port probe 0x3e0-0x4ff: [ 5401.662070] excluding nothing: probe failed. [ 5401.663632] pcmcia_socket pcmcia_socket0: cs: IO port probe 0x820-0x8ff: [ 5401.663676] excluding nothing: probe failed. [ 5401.664908] pcmcia_socket pcmcia_socket0: cs: IO port probe 0xc00-0xcf7: [ 5401.664947] excluding nothing: probe failed. [ 5401.666811] pcmcia_socket pcmcia_socket0: cs: memory probe 0x0c0000-0x0f= ffff: [ 5401.667155] excluding 0xc0000-0xfffff [ 5401.669654] pcmcia_socket pcmcia_socket0: cs: memory probe 0xa0000000-0x= a0ffffff: [ 5401.669713] excluding 0xa0000000-0xa0ffffff [ 5401.670930] pcmcia_socket pcmcia_socket0: cs: memory probe 0x60000000-0x= 60ffffff: [ 5401.670974] excluding 0x60000000-0x60ffffff [ 5401.671374] pcmcia_socket pcmcia_socket0: cs: IO port probe 0xa00-0xaff: [ 5401.671409] excluding nothing: probe failed. new: [ 5433.919596] yenta_cardbus 0000:02:06.0: CardBus bridge found [0000:0000] [ 5434.047165] yenta_cardbus 0000:02:06.0: ISA IRQ mask 0x0000, PCI irq 5 [ 5434.047213] yenta_cardbus 0000:02:06.0: Socket status: 30000006 [ 5434.047266] yenta_cardbus 0000:02:06.0: pcmcia: parent PCI bridge window= : [io 0xd000-0xdfff] [ 5434.047297] pcmcia_socket0: cs: IO port probe 0xd000-0xdfff: excluding 0= xd000-0xd0ff 0xd400-0xd4ff 0xd800-0xd8ff [ 5434.058597] yenta_cardbus 0000:02:06.0: pcmcia: parent PCI bridge window= : [mem 0xec100000-0xec1fffff] [ 5434.058626] pcmcia_socket0: cs: memory probe 0xec100000-0xec1fffff: excl= uding 0xec100000-0xec10ffff [ 5434.058998] yenta_cardbus 0000:02:06.0: pcmcia: parent PCI bridge window= : [mem 0x40000000-0x47ffffff pref] [ 5434.059019] pcmcia_socket0: cs: memory probe 0x40000000-0x47ffffff: excl= uding 0x40000000-0x47ffffff [ 5434.116776] pcmcia_socket0: cs: IO port probe 0x100-0x3af: excluding not= hing: probe failed. [ 5434.117187] pcmcia_socket0: cs: IO port probe 0x3e0-0x4ff: excluding not= hing: probe failed. [ 5434.117567] pcmcia_socket0: cs: IO port probe 0x820-0x8ff: excluding not= hing: probe failed. [ 5434.117846] pcmcia_socket0: cs: IO port probe 0xc00-0xcf7: excluding not= hing: probe failed. [ 5434.118131] pcmcia_socket0: cs: memory probe 0x0c0000-0x0fffff: excludin= g 0xc0000-0xfffff [ 5434.118516] pcmcia_socket0: cs: memory probe 0xa0000000-0xa0ffffff: excl= uding 0xa0000000-0xa0ffffff [ 5434.118771] pcmcia_socket0: cs: memory probe 0x60000000-0x60ffffff: excl= uding 0x60000000-0x60ffffff [ 5434.119106] pcmcia_socket0: cs: IO port probe 0xa00-0xaff: excluding not= hing: probe failed. --- drivers/pcmcia/rsrc_nonstatic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstati= c.c index da494fe451ba..9af46e75b98c 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -188,7 +188,7 @@ static void do_io_probe(struct pcmcia_socket *s, unsign= ed int base, int any; u_char *b, hole, most; =20 - dev_info(&s->dev, "cs: IO port probe %#x-%#x:", base, base+num-1); + pr_info("%s: cs: IO port probe %#x-%#x:", dev_name(&s->dev), base, base+n= um-1); =20 /* First, what does a floating port look like? */ b =3D kzalloc(256, GFP_KERNEL); @@ -410,8 +410,8 @@ static int do_mem_probe(struct pcmcia_socket *s, u_long= base, u_long num, struct socket_data *s_data =3D s->resource_data; u_long i, j, bad, fail, step; =20 - dev_info(&s->dev, "cs: memory probe 0x%06lx-0x%06lx:", - base, base+num-1); + pr_info("%s: cs: memory probe 0x%06lx-0x%06lx:", + dev_name(&s->dev), base, base+num-1); bad =3D fail =3D 0; step =3D (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff); /* don't allow too large steps */ --=20 2.46.0 --=20 Ren=C3=A9 Rebe, ExactCODE GmbH, Berlin, Germany https://exactco.de =E2=80=A2 https://t2linux.com =E2=80=A2 https://patreon.= com/renerebe